summaryrefslogtreecommitdiff
path: root/old/archive.html
diff options
context:
space:
mode:
authorRadiohotline <radiohotline@disroot.org>2026-02-17 12:12:37 +0000
committerRadiohotline <radiohotline@disroot.org>2026-02-17 12:12:37 +0000
commit223ef7acb24356fca6cf5ab40c02b43a09452093 (patch)
treed845297a50e78f9ca9c37c113b78b8a2aaa1c138 /old/archive.html
parentcae6b00e0f3352a323af2400bf7f9deb7460c7de (diff)
parent37522616a3efcaa3c7b40821155e8f1fff5c9985 (diff)
about
Diffstat (limited to 'old/archive.html')
-rw-r--r--old/archive.html22
1 files changed, 22 insertions, 0 deletions
diff --git a/old/archive.html b/old/archive.html
index d79441f..e05e643 100644
--- a/old/archive.html
+++ b/old/archive.html
@@ -31,6 +31,7 @@
<div class="art-container">
<h4>2025</h4>
+<<<<<<< HEAD
<img loading="lazy" src="../img/art/2025/jojomart.jpeg">
<img loading="lazy" src="../img/art/2025/bikeghost.jpg">
<h4>2024</h4>
@@ -50,6 +51,27 @@
<img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg">
<img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg">
<img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg">
+=======
+ <img loading="lazy" src="../img/art/2025/jojomart.jpeg">
+ <img loading="lazy" src="../img/art/2025/bikeghost.jpg">
+ <h4>2024</h4>
+ <img loading="lazy" src="../img/art/2024/aphrodite.jpg">
+ <h4>2023</h4>
+ <img loading="lazy" src="../img/art/2023/mobpsychofinal2.png">
+ <img loading="lazy" src="../img/art/2023/mart.jpg">
+ <img loading="lazy" src="../img/art/2023/mind_parasite.png">
+ <h4>2022</h4>
+ <img loading="lazy" src="../img/art/2022/IMG_20240718_224050.jpg">
+ <img loading="lazy" src="../img/art/2022/seki.jpg">
+ <img loading="lazy" src="../img/art/2022/link.jpg">
+ <img loading="lazy" src="../img/art/2022/IMG_20220829_203310.jpg">
+ <img loading="lazy" src="../img/art/2022/IMG_20220127_205955.jpg">
+ <h4>2021</h4>
+ <img loading="lazy" src="../img/art/2021/2021satoru.jpg">
+ <img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg">
+ <img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg">
+ <img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
</div>
</body>
</html>