Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies. |
||
|---|---|---|
| .. | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| redis | ||
| tasks | ||
| templates | ||
| webpacker | ||
| cli.rb | ||