Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
helpers	…
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
validators	…
views	…
workers	…