This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
Thibaut Girka
91bef4759f
Merge branch 'master' into glitch-soc/merge-upstream
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
|
2018-09-19 21:46:01 +02:00 |
| .. |
|
assets.js
|
…
|
|
|
babel.js
|
…
|
|
|
babel_external.js
|
…
|
|
|
mark.js
|
…
|
|
|
sass.js
|
…
|
|