mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +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 |
||
---|---|---|
.. | ||
rules | ||
configuration.js | ||
development.js | ||
generateLocalePacks.js | ||
production.js | ||
shared.js | ||
tests.js | ||
translationRunner.js |