Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-04-27 12:39:38 +00:00
commit 4d02d28aef

6
package-lock.json generated
View File

@ -4955,9 +4955,9 @@
"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=" "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
}, },
"hoek": { "hoek": {
"version": "4.2.0", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
}, },
"hoist-non-react-statics": { "hoist-non-react-statics": {
"version": "2.3.1", "version": "2.3.1",