mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-25 16:41:36 +01:00
b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
---|---|---|
.. | ||
cli | ||
migration_helpers.rb | ||
migration_warning.rb | ||
rack_middleware.rb | ||
redis_configuration.rb | ||
sidekiq_middleware.rb | ||
snowflake.rb | ||
version.rb |