mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
8103e69b17
Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well. |
||
|---|---|---|
| .. | ||
| admin.tsx | ||
| application.ts | ||
| common.js | ||
| embed.tsx | ||
| error.ts | ||
| inert.ts | ||
| mailer.ts | ||
| public-path.ts | ||
| public.tsx | ||
| remote_interaction_helper.ts | ||
| share.tsx | ||
| sign_up.ts | ||
| two_factor_authentication.ts | ||