You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		6 years ago
..
exports	…
two_factor_authentication	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
base_controller.rb	…
deletes_controller.rb	…
exports_controller.rb	Fix data export page error	7 years ago
flavours_controller.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
imports_controller.rb	…
migrations_controller.rb	Fix migration page style	7 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
sessions_controller.rb	…
two_factor_authentications_controller.rb	…