mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 23:24:55 +01:00
Code Issues Projects Releases Wiki Activity
340cb4a04c
mastodon/app/views/settings/preferences
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
..
appearance Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
notifications Fix notifications label (#12517) 2019-12-02 13:39:53 +01:00
other Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00