Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| v2_alpha | ||
| web | ||
Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| v2_alpha | ||
| web | ||