Merge branch 'markjh/encrypted-attachments' of github.com:matrix-org/matrix-react-sdk into markjh/encrypted-attachments

This commit is contained in:
Mark Haines 2016-11-03 16:39:32 +00:00
commit d61714ab8d

View file

@ -55,6 +55,7 @@
"fuse.js": "^2.2.0",
"glob": "^5.0.14",
"highlight.js": "^8.9.1",
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"marked": "^0.3.5",