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
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
common.js	Avoid loading rails-ujs twice on vanilla flavour	6 years ago
embed.js	Finalized theme loading and stuff	7 years ago
mailer.js	Fixed improper mailer import	7 years ago
public.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
theme.yml	Fix CW fold/unfold in remote interaction dialog	6 years ago