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
..
components	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers	Split out is_changing_upload from is_submitting (#9536)	6 years ago
util	Misc. typos (#8694)	6 years ago
index.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago