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

Do not fetch environment variables to determine default locale (#6618)

2018-03-04 10:00:46 +01:00

auto_annotate_models.rake

…

db.rake

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

emojis.rake

…

glitchsoc.rake

…

mastodon.rake

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

statistics.rake

…