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 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		7 years ago
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	7 years ago
auto_annotate_models.rake	…
db.rake	…
emojis.rake	…
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Fix missing column in select in mastodon:feeds:build task (#7720)	7 years ago
statistics.rake	…