florence-social / mastodon-fork

Florence's fork of Mastodon
GNU Affero General Public License v3.0
138 stars 15 forks source link

Fix incorrect merge of admin settings #105

Closed clarfonthey closed 5 years ago

clarfonthey commented 5 years ago

Fixes #101. This was due to these keys being left out when merging upstream changes.

clarfonthey commented 5 years ago

@EliotBerriot if you're able to try out this fix, I would love to verify that this fixes your issue

agateblue commented 5 years ago

@clarfon it will be a bit tedious since I'm running a dockerized instance but I can try something this week :)

agateblue commented 5 years ago

Sorry, I won't have time to try this soon, but I'm pretty sure you nailed it!