tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
a0b614f10a
mastodon/app/views/settings/preferences
History
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
appearance Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
notifications Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
other Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00