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
..
migration_helpers.rb	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	7 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
redis_config.rb	Add support for separate Redis for cache (#7272)	7 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
version.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago