1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-24 00:23:09 -05:00
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
..