mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
22cfab0ebf
Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |