18556d3e9b
Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did. |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| entrypoints | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| material-icons | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||