Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
accounts_cli.rb	Fix tootctl accounts reattaching not unsuspending deleted account (#8812)	2018-09-29 18:40:40 +09:00
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	2018-09-09 13:33:36 +02:00
emoji_cli.rb	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
feeds_cli.rb	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
media_cli.rb	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
migration_helpers.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +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	Add -glitch suffix to version string	2018-09-26 11:11:30 +02:00