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
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	…
emojis.rake	…
glitchsoc.rake	…
mastodon.rake	…
statistics.rake	…