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 a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc		6 years ago
..
accounts_cli.rb	Add `tootctl accounts reset-relationships` (#10483)	6 years ago
cli_helper.rb	…
domains_cli.rb	Fix `tootctl domains crawl` with JSON format output crash (#9820)	6 years ago
emoji_cli.rb	Add `tootctl emoji purge` (#10481)	6 years ago
feeds_cli.rb	…
media_cli.rb	Fix "tootctl media remove" can't count the file size (#9288)	6 years ago
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	…
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 missing long description on `tootctl statuses remove` (#10482)	6 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago