Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49: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
keyword_mutes_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