fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-04 10:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin/settings
History
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
..
edit.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00