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	…
lib	…
mailers	…
models	…
policies	…
presenters	…
requests	…
routing	…
services	…
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…