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
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
premailer_webpack_strategy.rb
redis_config.rb
snowflake.rb
version.rb