15f6d2d038
Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web |