mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-20 00:59:04 +01:00
077e0c6812
Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |