Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
exports
two_factor_authentication
applications_controller_spec.rb
deletes_controller_spec.rb
exports_controller_spec.rb
flavours_controller_spec.rb
follower_domains_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb
notifications_controller_spec.rb
preferences_controller_spec.rb
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentications_controller_spec.rb