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
..
action_bar.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	2018-07-01 04:16:13 +02:00
character_counter.js
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00
emoji_picker_dropdown.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
navigation_bar.js	Fix "Invalid DOM property class" (#7798)	2018-06-14 08:03:07 +02:00
privacy_dropdown.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
search.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
search_results.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
text_icon_button.js
upload.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
upload_button.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
upload_form.js
upload_progress.js	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
warning.js