mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 00:38:07 +01:00
5a55180b95
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
v2_alpha | ||
web | ||
oembed_spec.rb |