You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ab5ff638f2 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		5 years ago
..
accounts_cli.rb	Remove unused option from tootctl accounts cull (#12074)	5 years ago
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
cli_helper.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
domains_cli.rb	Change `tootctl domains purge` to accept multiple domains at once (#12046)	5 years ago
emoji_cli.rb	Add categories for custom emojis (#11196)	5 years ago
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
media_cli.rb	Fix error handling in `tootctl media remove-orphans` (#12571)	5 years ago
migration_helpers.rb	…
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
redis_config.rb	…
search_cli.rb	Add parallelization to `tootctl search deploy` (#12051)	5 years ago
settings_cli.rb	…
snowflake.rb	…
statuses_cli.rb	Merge branch 'master' into glitch-soc/master	5 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago