37e746eab6
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. |
||
|---|---|---|
| .. | ||
| about.js | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public.js | ||
| share.js | ||
| two_factor_authentication.js | ||