mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
f3a4d57be1
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |