mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 04:07:45 +00:00
76918554a6
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock |
||
---|---|---|
.. | ||
rules | ||
configuration.js | ||
development.js | ||
generateLocalePacks.js | ||
production.js | ||
shared.js | ||
test.js | ||
translationRunner.js |