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
..
assets	…
devise	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
paperclip	…
tasks	…
templates/haml/scaffold	…