mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 22:59:46 +09:00
8c3c27bf06
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes. |
||
|---|---|---|
| .. | ||
| action_bar.js | ||
| autosuggest_account.js | ||
| character_counter.js | ||
| compose_form.js | ||
| emoji_picker_dropdown.js | ||
| navigation_bar.js | ||
| poll_button.js | ||
| poll_form.js | ||
| privacy_dropdown.js | ||
| reply_indicator.js | ||
| search_results.js | ||
| search.js | ||
| text_icon_button.js | ||
| upload_button.js | ||
| upload_form.js | ||
| upload_progress.js | ||
| upload.js | ||
| warning.js | ||