fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/settings/preferences/appearance
History
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00