projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21c85a1 4a925b9)
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
authorlain <lain@soykaf.club>
Sun, 17 May 2020 07:48:52 +0000 (07:48 +0000)
committerlain <lain@soykaf.club>
Sun, 17 May 2020 07:48:52 +0000 (07:48 +0000)
Remove settings that shouldn't be altered

Closes admin-fe#110

See merge request pleroma/pleroma!2540

1  2 
config/description.exs patch | diff1 | diff2 | blob | history

diff --cc config/description.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git