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 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		5 years ago
..
exports	…
migration	…
preferences	…
two_factor_authentication	…
aliases_controller.rb	…
applications_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
deletes_controller.rb	…
exports_controller.rb	…
featured_tags_controller.rb	…
flavours_controller.rb	…
identity_proofs_controller.rb	…
imports_controller.rb	…
migrations_controller.rb	…
preferences_controller.rb	…
profiles_controller.rb	…
sessions_controller.rb	…
two_factor_authentications_controller.rb	…