projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 265746b 4c48626)
Merge branch 'chore/update-config-fe' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 20 May 2020 17:45:19 +0000 (17:45 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 20 May 2020 17:45:19 +0000 (17:45 +0000)
Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560

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

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