Thibaut Girka 5a158899bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
accounts_cli.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
cache_cli.rb	Add tootctl cache clear (#10689)	2019-05-04 01:02:57 +02:00
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	2018-09-09 13:33:36 +02:00
domains_cli.rb	Remove custom emojis on "tootctl domains purge" (#10721)	2019-05-09 22:03:20 +02:00
emoji_cli.rb	Specify gzip required in tootctl emoji help (#11000)	2019-06-08 12:43:11 -04: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	Fix "tootctl media remove" can't count the file size (#9288)	2018-11-16 09:47:40 +01:00
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	2019-01-27 23:56:07 +01: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
search_cli.rb	Add tootctl search deploy to avoid ugly rake task syntax (#10403)	2019-03-28 02:16:11 +01:00
settings_cli.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
snowflake.rb	Fixes/do not override timestamps (#7336)	2018-05-03 23:02:46 +02:00
statuses_cli.rb	Fix missing long description on tootctl statuses remove (#10482)	2019-04-06 04:47:26 +02:00
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00