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 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		7 years ago
..
exports	Remove exports/base controller in favor of shared concern (#3444)	8 years ago
two_factor_authentication	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
applications_controller.rb	…
base_controller.rb	…
deletes_controller.rb	Prepend check_enabled_deletion to Settings::DeletesController (#229)	7 years ago
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	Slightly reduce RAM usage (#7301)	7 years ago
imports_controller.rb	…
keyword_mutes_controller.rb	…
migrations_controller.rb	Fix migration page style	7 years ago
notifications_controller.rb	…
preferences_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
profiles_controller.rb	Merge branch 'master' into glitch-soc/master	7 years ago
sessions_controller.rb	…
two_factor_authentications_controller.rb	…