projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db13acf 92e6801)
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 8 Jul 2020 03:25:30 +0000 (03:25 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 8 Jul 2020 03:25:30 +0000 (03:25 +0000)
Resolve "Better support for resetting avatar/header/background"

Closes #1918

See merge request pleroma/pleroma!2729

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git