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 cd99255698 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		6 years ago
..
accounts_cli.rb	tootctl accounts [add|del|cull] (#8642)	6 years ago
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	6 years ago
emoji_cli.rb	Add CLI task for rotating keys (#8466)	6 years ago
media_cli.rb	Add --verbose and --dry-run option to tootctl media remove (#8519)	6 years ago
migration_helpers.rb	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	7 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
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago