mastodon/app/controllers/settings
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
..
exports
two_factor_authentication Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-21 13:36:10 -06:00
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 Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller.rb
imports_controller.rb
keyword_mutes_controller.rb
migrations_controller.rb Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026) 2017-12-14 21:35:30 +01:00
notifications_controller.rb
preferences_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb