You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/lib/tasks
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
8 years ago
..
assets.rake Do not fetch environment variables to determine default locale (#6618) 8 years ago
auto_annotate_models.rake Improve RuboCop rules (compatibility to Code Climate) (#3636) 9 years ago
db.rake Set snowflake IDs for backdated statuses (#5260) 8 years ago
emojis.rake Compress and combine emoji data (#5229) 8 years ago
glitchsoc.rake Add Rake task to backfill local-only flag (#253) 8 years ago
mastodon.rake Slightly reduce RAM usage (#7301) 8 years ago
statistics.rake