Merge branch 'master' into frontend-next

2017-01-13 22:53:33 +08:00
parent 3566d71aea 3cf40a8dec
commit 3d6b319216
18 changed files with 306 additions and 69 deletions
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
    "passport-github": "^1.1.0",
    "passport-gitlab2": "^2.2.0",
    "passport-google-oauth20": "^1.0.0",
+    "passport-ldapauth": "^0.6.0",
    "passport-local": "^1.0.0",
    "passport-twitter": "^1.0.4",
    "passport.socketio": "^3.7.0",