ae5c237607
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 |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
emoji_picker_dropdown.js | ||
navigation_bar.js | ||
privacy_dropdown.js | ||
reply_indicator.js | ||
search.js | ||
search_results.js | ||
text_icon_button.js | ||
upload.js | ||
upload_button.js | ||
upload_form.js | ||
upload_progress.js | ||
warning.js |