Merge branch 'master' of https://github.com/PhilWaldmann/openrecord

Conflicts: .gitignore
PhilWaldmann · Feb 6, 2015 · 36de3d5 · 36de3d5
2 parents 9944d9a + 9795a42
commit 36de3d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,17 +2,9 @@
 *.csv
 
 documentation/wiki
-
+wiki
 logs
-
-npm-debug.log
 node_modules
 
 coverage.html
-.coveralls.yml
-
-wiki/
-
-lib/base/collection.js
-
-lib/stores/activedirectory/data_types/user_account_control.js
+.coveralls.yml
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
         "validator": ">= 3.1.x",
         "inflection": ">= 1.3.x",
         "knex": "git+https://github.com/tgriesser/knex.git#9767fdce69cd603b5f609554be3dd77c568a9416",
-				"bluebird": "~ 2.6.x",                   
+				"bluebird": "~ 2.x.x",                   
         "moment": ">= 2.7.x"
     },
     "devDependencies": {