Merge branch 'develop' into kegan/blocking
This commit is contained in:
commit
cc313f350c
8 changed files with 20 additions and 10 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vector-web",
|
||||
"version": "0.0.1",
|
||||
"version": "0.1.2",
|
||||
"description": "Vector webapp",
|
||||
"author": "matrix.org",
|
||||
"repository": {
|
||||
|
@ -28,9 +28,9 @@
|
|||
"filesize": "^3.1.2",
|
||||
"flux": "~2.0.3",
|
||||
"linkifyjs": "^2.0.0-beta.4",
|
||||
"matrix-js-sdk": "^0.2.2",
|
||||
"matrix-react-sdk": "^0.0.1",
|
||||
"modernizr": "^3.1.0",
|
||||
"matrix-js-sdk": "^0.3.0",
|
||||
"matrix-react-sdk": "^0.0.2",
|
||||
"q": "^1.4.1",
|
||||
"react": "^0.13.3",
|
||||
"react-loader": "^1.4.0"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue