David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream		2018-05-04 03:23:57 -05:00
..
migration_helpers.rb	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	2018-04-20 12:21:28 +02:00
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	2018-01-29 01:06:39 +01:00
redis_config.rb	Add support for separate Redis for cache (#7272)	2018-04-27 01:37:59 +02:00
snowflake.rb	Fixes/do not override timestamps (#7336)	2018-05-03 23:02:46 +02:00
version.rb	Point to glitch-soc source and not tootsuite on the public page	2018-04-08 15:43:26 +02:00