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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-30 12:36:24 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 17:39:20 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 18:35:25 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00