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	Improve RuboCop rules (compatibility to Code Climate) (#3636)	2017-06-08 13:24:28 +02:00
db.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
emojis.rake	Compress and combine emoji data (#5229)	2017-10-06 03:42:34 +02:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00