Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
chewy
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
policies
presenters
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
validators
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
workers	checking http status code with range (#7544)	2018-05-19 14:47:44 +02:00