wodka
1caf34c230
Merge remote-tracking branch 'origin/fixUXBugs' into features/missing
# Conflicts:
# .gitignore
# app/views/form.server.view.pug
# package-lock.json
# package.json
# public/form_modules/forms/base/config/i18n/french.js
# public/modules/core/config/core.client.routes.js
# public/modules/core/config/i18n/french.js
# public/modules/core/controllers/header.client.controller.js
# public/modules/forms/admin/css/admin-form.css
# public/modules/users/controllers/authentication.client.controller.js
# public/modules/users/services/auth.client.service.js
# scripts/create_admin.js
# server.js
2019-07-11 23:32:25 +02:00
..
2017-11-21 17:26:52 -08:00
2017-10-07 04:50:52 -04:00
2017-08-01 19:12:13 -04:00
2019-07-11 23:32:25 +02:00
2017-11-21 17:26:52 -08:00
2015-06-29 15:51:29 -07:00