mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-22 04:07:34 +02:00
3869daef09
Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |