luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
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
other Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00