projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15cb1f6 7a2e153)
Merge branch 'config-changes' into 'develop'
authorfeld <feld@feld.me>
Thu, 6 Feb 2020 16:02:46 +0000 (16:02 +0000)
committerfeld <feld@feld.me>
Thu, 6 Feb 2020 16:02:46 +0000 (16:02 +0000)
Config changes

Closes #1547

See merge request pleroma/pleroma!2174


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git