David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
assets.rake	Require environment for generate_static_pages (#6420)	2018-02-03 18:41:01 +01:00
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	2017-06-08 13:24:28 +02:00
db.rake	Set snowflake IDs for backdated statuses (#5260)	2017-10-08 17:34:34 +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	Fixes #6584 (#6585)	2018-03-01 23:30:06 +01:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00