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.

David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		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	Finalized theme loading and stuff	7 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	Finalized theme loading and stuff	7 years ago
flavours_controller.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller.rb	Finalized theme loading and stuff	7 years ago
imports_controller.rb	Finalized theme loading and stuff	7 years ago
keyword_mutes_controller.rb	Finalized theme loading and stuff	7 years ago
migrations_controller.rb	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	7 years ago
notifications_controller.rb	Finalized theme loading and stuff	7 years ago
preferences_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
profiles_controller.rb	Finalized theme loading and stuff	7 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