Revert "Revert "Merge pull request #3654 from vector-im/matthew/quick-search""

This reverts commit 9fc9de3af5.
This commit is contained in:
David Baker
2017-05-17 10:10:41 +01:00
parent 9fc9de3af5
commit cfc6304b05
5 changed files with 309 additions and 86 deletions
+1 -2
View File
@@ -61,7 +61,6 @@
"favico.js": "^0.3.10",
"filesize": "3.5.6",
"flux": "~2.0.3",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
@@ -74,7 +73,7 @@
"react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2",
"react-dom": "^15.4.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#39d858c",
"sanitize-html": "^1.11.1",
"ua-parser-js": "^0.7.10",
"url": "^0.11.0"