f2b23aa5f3
Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |
f2b23aa5f3
Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |