mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 07:01:36 +01:00
3f60b096b5
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
proofs_controller.rb |