mastodon/app/controllers/settings
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
exports
two_factor_authentication
applications_controller.rb
base_controller.rb
deletes_controller.rb Prepend check_enabled_deletion to Settings::DeletesController (#229) 2017-12-06 16:19:43 -06:00
exports_controller.rb
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller.rb Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
imports_controller.rb
keyword_mutes_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
migrations_controller.rb
notifications_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00