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
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
policies	…
presenters	…
requests	…
routing	…
services	…
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…