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
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
features	…
fixtures	…
helpers	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05: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	2018-05-11 18:12:42 +02:00
policies	…
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
support	…
validators	…
views	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
workers	…
rails_helper.rb	…
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00