mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-13 17:06:22 +00:00
9101254d0a
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
proofs_controller.rb |