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 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 years ago
..
accounts_cli.rb	Limit "tootctl accounts follow" to local accounts (#11592)	5 years ago
cache_cli.rb	Add `tootctl cache recount` command (#11597)	5 years ago
cli_helper.rb	…
domains_cli.rb	Add option to exclude suspended domains/subdomains from tootctl domains crawl (#11454)	6 years ago
emoji_cli.rb	Add categories for custom emojis (#11196)	6 years ago
feeds_cli.rb	…
media_cli.rb	…
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	Add `tootctl preview_cards remove` (#11320)	6 years ago
redis_config.rb	…
search_cli.rb	Add `tootctl search deploy` to avoid ugly rake task syntax (#10403)	6 years ago
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	…
statuses_cli.rb	Fix tootctl statuses remove	6 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago