mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 19:51:36 +01:00
65ca37bbaa
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Conflict due to glitch-soc having factored the file differently. Ported upstream's changes. |
||
---|---|---|
.. | ||
config_spec.rb |