mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock |
||
---|---|---|
.. | ||
assets.js | ||
babel_external.js | ||
babel.js | ||
mark.js | ||
sass.js |