mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 10:43:43 +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 |