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		2019-02-01 16:12:20 +01:00
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00
containers	Split out is_changing_upload from is_submitting (#9536)	2018-12-16 21:17:56 +01:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00