Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
accounts_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	2018-09-09 13:33:36 +02:00
domains_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
emoji_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
feeds_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
media_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
migration_helpers.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +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
settings_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +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-10-30 17:52:08 +01:00