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

This commit is contained in:
Weblate 2018-08-02 10:57:47 +00:00
commit f39e3f385c

View file

@ -70,7 +70,7 @@
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"react": "^15.6.0", "react": "^15.6.0",
"react-dom": "^15.6.0", "react-dom": "^15.6.0",
"sanitize-html": "^1.11.1", "sanitize-html": "1.18.2",
"ua-parser-js": "^0.7.10", "ua-parser-js": "^0.7.10",
"url": "^0.11.0" "url": "^0.11.0"
}, },