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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 years ago
..
accounts_cli.rb	Fix tootctl accounts rotate not updating public keys (#9556)	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