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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
exports	Remove exports/base controller in favor of shared concern (#3444)	7 years ago
two_factor_authentication	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
base_controller.rb	Finalized theme loading and stuff	7 years ago
deletes_controller.rb	Prepend check_enabled_deletion to Settings::DeletesController (#229)	7 years ago
exports_controller.rb	Fix data export page error	6 years ago
flavours_controller.rb	Thank you, Officer Murphy	6 years ago
follower_domains_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
imports_controller.rb	Finalized theme loading and stuff	7 years ago
migrations_controller.rb	Fix migration page style	6 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	6 years ago
sessions_controller.rb	Finalized theme loading and stuff	7 years ago
two_factor_authentications_controller.rb	Finalized theme loading and stuff	7 years ago