Merge branch 'vnc'

This commit is contained in:
Simo Kinnunen
2015-09-28 15:01:43 +09:00
14 changed files with 927 additions and 60 deletions

View File

@@ -40,6 +40,7 @@
"compression": "^1.5.2",
"cookie-session": "^1.2.0",
"csurf": "^1.7.0",
"debug": "^2.2.0",
"eventemitter3": "^0.1.6",
"express": "^4.13.3",
"express-validator": "^2.17.1",
@@ -49,6 +50,7 @@
"http-proxy": "^1.11.2",
"in-publish": "^2.0.0",
"jade": "^1.9.2",
"jpeg-turbo": "^0.3.0",
"jws": "^3.1.0",
"ldapjs": "git+https://github.com/mcavage/node-ldapjs.git#acc1ca8f4314fd9d67561feabc8ce4c235076a5e",
"lodash": "^3.10.1",