mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 12:58:06 +01:00
2d09653d50
Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |