mastodon/app/controllers/settings
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	Gemfile.lock
 	config/application.rb
2018-04-13 16:36:46 -05:00
..
exports
two_factor_authentication
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
flavours_controller.rb
follower_domains_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-13 16:36:46 -05:00
imports_controller.rb
keyword_mutes_controller.rb
migrations_controller.rb
notifications_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb