Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there. |
||
|---|---|---|
| .. | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| redis | ||
| tasks | ||
| templates | ||
| cli.rb | ||