Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		2020-12-05 17:33:37 +01:00
..
action_bar.js
autosuggest_account.js
character_counter.js
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-05 17:33:37 +01:00
emoji_picker_dropdown.js	Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003)	2020-11-05 02:21:05 +09:00
navigation_bar.js
poll_button.js
poll_form.js
privacy_dropdown.js	Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003)	2020-11-05 02:21:05 +09:00
reply_indicator.js
search.js
search_results.js
text_icon_button.js
upload.js
upload_button.js	Improve wording of the “Add media” button tooltip (#13954)	2020-06-26 00:14:29 +02:00
upload_form.js
upload_progress.js
warning.js