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 e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		6 years ago
..
account/components	Refactor icons in web UI to use Icon component (#9951)	6 years ago
account_gallery	Refactor icons in web UI to use Icon component (#9951)	6 years ago
account_timeline	Refactor icons in web UI to use Icon component (#9951)	6 years ago
blocks	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	Fix direct messages column not loading more items on scroll (#9102)	6 years ago
domain_blocks	…
emoji	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
favourited_statuses	…
favourites	…
follow_requests	…
followers	Various fixes to scrollable lists and media gallery (#9501)	6 years ago
following	Various fixes to scrollable lists and media gallery (#9501)	6 years ago
generic_not_found	…
getting_started	Refactor icons in web UI to use Icon component (#9951)	6 years ago
hashtag_timeline	Fix that translation is not applied to "joining hashtags" (#9397)	6 years ago
home_timeline	…
introduction	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
keyboard_shortcuts	…
list_adder	Refactor icons in web UI to use Icon component (#9951)	6 years ago
list_editor	Refactor icons in web UI to use Icon component (#9951)	6 years ago
list_timeline	Refactor icons in web UI to use Icon component (#9951)	6 years ago
lists	…
mutes	…
notifications	Refactor icons in web UI to use Icon component (#9951)	6 years ago
pinned_statuses	Revert Font Awesome 5 upgrade (#8810)	6 years ago
public_timeline	Clean up dead code in public timeline code (#9565)	6 years ago
reblogs	…
report	…
standalone	Improve the public hashtag page (#9831)	6 years ago
status	Refactor icons in web UI to use Icon component (#9951)	6 years ago
ui	Refactor icons in web UI to use Icon component (#9951)	6 years ago
video	Refactor icons in web UI to use Icon component (#9951)	6 years ago