mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 13:33:44 +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`. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |