mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 23:44:33 +00:00
45709d6987
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| middleware | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||