Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
policies	…
presenters	…
serializers	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
workers	…