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

pull/21833/head
Weblate 2018-01-07 20:33:13 +00:00
commit c8797a1347
1 changed files with 1 additions and 1 deletions

View File

@ -56,7 +56,7 @@
"browser-encrypt-attachment": "^0.3.0", "browser-encrypt-attachment": "^0.3.0",
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"classnames": "^2.1.2", "classnames": "^2.1.2",
"commonmark": "^0.27.0", "commonmark": "^0.28.1",
"counterpart": "^0.18.0", "counterpart": "^0.18.0",
"draft-js": "^0.11.0-alpha", "draft-js": "^0.11.0-alpha",
"draft-js-export-html": "^0.6.0", "draft-js-export-html": "^0.6.0",