Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
services	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
workers	…