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

This commit is contained in:
Weblate 2017-12-04 12:26:11 +00:00
commit bb6aabc017

View file

@ -68,8 +68,8 @@
"gfm.css": "^1.1.1", "gfm.css": "^1.1.1",
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3", "linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.9.1", "matrix-js-sdk": "0.9.2",
"matrix-react-sdk": "0.11.2", "matrix-react-sdk": "0.11.3",
"modernizr": "^3.1.0", "modernizr": "^3.1.0",
"pako": "^1.0.5", "pako": "^1.0.5",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",