mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 16:58:06 +01:00
876aa35350
Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |