Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| remotable_spec.rb | ||
Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| remotable_spec.rb | ||