f8d867bac4
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. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||