wodka 2276ca100f Merge branch 'master' into 2.20 ...

# Conflicts:
#	config/env/secure.js
#	package-lock.json
#	package.json
#	public/form_modules/forms/base/css/form.css
#	public/modules/forms/admin/config/i18n/french.js

2019-07-11 23:18:55 +02:00

..

core

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

forms

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

users

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00