mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 15:35:10 +00:00
91bef4759f
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js |
||
---|---|---|
.. | ||
assets.js | ||
babel.js | ||
babel_external.js | ||
mark.js | ||
sass.js |