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.		2018-06-07 05:13:49 -05: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	…
db.rake	…
emojis.rake	…
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Fix missing column in select in mastodon:feeds:build task (#7720)	2018-06-04 04:21:15 +02:00
statistics.rake	…