]> git.bochard.net Git - mysite.git/commit
merge conflict fix
authortenkyuu <hello@tenkyuu.dev>
Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
committertenkyuu <hello@tenkyuu.dev>
Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
commit7ba5acf698bc5add184fef981ac6462fa2e06a3e
tree933debc564ba5fff4bf7001e4e269bea8e1a1b22
parentaacb038e1c991963bf964ca476b7e4af0f296db6
parentc676dc067f8dfc781106e467425a5f8c42d7b25c
merge conflict fix
assets/icons/favicon.ico
assets/pfp/profile.jpg