mastodon/app/controllers/settings
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
exports Add CSV export for lists and domain blocks (#9677) 2019-01-01 13:44:04 +01:00
two_factor_authentication Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
base_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
deletes_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
exports_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
featured_tags_controller.rb Fix pinned statuses being shown in a featured hashtag (#9971) 2019-02-05 00:27:18 +01:00
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
identity_proofs_controller.rb Allow turning keybase off instance-wide 2019-04-19 00:57:39 +02:00
imports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
migrations_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
profiles_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
two_factor_authentications_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00