You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		7 years ago
..
assets.rake	Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)	7 years ago
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	7 years ago
db.rake	Set snowflake IDs for backdated statuses (#5260)	7 years ago
emojis.rake	Compress and combine emoji data (#5229)	7 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Fix regeneration marker not expiring (#6290)	7 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago