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
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
helpers	…
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
policies	…
presenters	…
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
workers	…