Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
exports	Remove exports/base controller in favor of shared concern (#3444)	2017-05-30 19:06:01 +02:00
two_factor_authentication
applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
base_controller.rb
deletes_controller.rb
exports_controller.rb	Fix data export page error	2018-02-24 00:29:26 +09:00
flavours_controller.rb
follower_domains_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00:00
imports_controller.rb
migrations_controller.rb	Fix migration page style	2018-03-30 15:26:12 +02:00
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +02:00
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +02:00
profiles_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-17 11:17:21 +00:00
sessions_controller.rb
two_factor_authentications_controller.rb