luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-13 02:12:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/settings
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
..
applications
deletes
exports
featured_tags
flavours Fix settings/flavours 2019-03-16 16:21:20 +01:00
identity_proofs squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
imports
migrations
preferences Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
shared
two_factor_authentication
two_factor_authentications