a5127d0ef8
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. |
||
---|---|---|
.. | ||
admin.rb | ||
api.rb | ||
settings.rb |