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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		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)	6 years ago
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
media_cli.rb	Change `tootctl media refresh` to skip already downloaded attachments (#12118)	5 years ago
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
redis_config.rb	Add support for separate Redis for cache (#7272)	7 years ago
search_cli.rb	Add parallelization to `tootctl search deploy` (#12051)	5 years ago
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
statuses_cli.rb	Fix tootctl statuses remove	6 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago