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. |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| entrypoints | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| material-icons | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||