Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||