Thibaut Girka fa4a92e340 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
accounts_cli.rb	Remove unused option from tootctl accounts cull (#12074)	2019-10-06 04:30:07 +02:00
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
cli_helper.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
domains_cli.rb	Change tootctl domains purge to accept multiple domains at once (#12046)	2019-10-02 04:49:53 +02:00
emoji_cli.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
media_cli.rb	Fix error handling in tootctl media remove-orphans (#12571)	2019-12-09 04:26:00 +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
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
redis_config.rb	Add support for separate Redis for cache (#7272)	2018-04-27 01:37:59 +02:00
search_cli.rb	Add parallelization to tootctl search deploy (#12051)	2019-10-02 21:50:43 +02: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	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00