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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
accounts_cli.rb	Add tootctl accounts follow ACCT (#9414)	6 years ago
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	6 years ago
domains_cli.rb	Improve account suspension speed and completeness (#9290)	6 years ago
emoji_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago
feeds_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago
media_cli.rb	Fix "tootctl media remove" can't count the file size (#9288)	6 years ago
migration_helpers.rb	rubocop issues - Cleaning up (#8912)	6 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
redis_config.rb	Add support for separate Redis for cache (#7272)	7 years ago
settings_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago