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
..
account/components	…
account_gallery	…
account_timeline	…
blocks	…
community_timeline	Upgrade Babel to version 7.0.0 (#5925)	7 years ago
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	…
domain_blocks	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
emoji	Revert "fix: update to emoji-mart 2.10.0 (#10281)"	6 years ago
favourited_statuses	…
favourites	…
follow_requests	…
followers	…
following	…
generic_not_found	…
getting_started	…
hashtag_timeline	…
home_timeline	…
introduction	…
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	…
lists	…
mutes	…
notifications	…
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
standalone	…
status	…
ui	…
video	…