mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 03:57:33 +02: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`. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |