Merge remote-tracking branch 'origin/master'
authorLanius Trolling <lanius@laniustrolling.dev>
Sun, 22 Dec 2024 21:00:37 +0000 (16:00 -0500)
committerLanius Trolling <lanius@laniustrolling.dev>
Sun, 22 Dec 2024 21:00:37 +0000 (16:00 -0500)
commit88f4c4a2db4ab004599ce7cc72f46e31819b4574
tree628a1fcafea73c8ea102ba542b019401753cd15c
parent7d9943f02c4f4c525504fc75724a37101dfa8425
parentf0b6030a4bf679a0446c61294b0ea7c18a7547c3
Merge remote-tracking branch 'origin/master'

# Conflicts:
# src/main/kotlin/info/mechyrdia/route/ResourceWebDav.kt
src/main/kotlin/info/mechyrdia/route/ResourceWebDav.kt