Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused. |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| core | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| packs | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||