mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 13:17:13 +00:00
f3a4d57be1
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
---|---|---|
.. | ||
admin.js | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.js | ||
share.js |