mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 07:08:07 +01:00
21e7a53ca5
Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||