monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/settings
History
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
 		2018-12-09 16:08:04 +01:00
..
exports
…
two_factor_authentication Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
applications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
deletes_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
exports_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
imports_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
migrations_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
notifications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
profiles_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
two_factor_authentications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00