Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

accounts_cli.rb

Add CLI task for rotating keys (#8466)

2018-08-26 20:21:03 +02:00

cli_helper.rb

Add CLI interface for importing custom emoji (#8437)

2018-08-26 16:53:06 +02:00

emoji_cli.rb

Add CLI task for rotating keys (#8466)

2018-08-26 20:21:03 +02:00

media_cli.rb

Add CLI task for rotating keys (#8466)

2018-08-26 20:21:03 +02: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

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-24 15:10:34 +02:00