Merge branch 'development' of github.com:TNOCS/csWeb into development

TNOCS · Oct 28, 2015 · 9c94c2f · 9c94c2f
2 parents 25b3619 + 893d195
commit 9c94c2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -3,14 +3,14 @@
     "version": "0.1.1",
     "main": "dist/csComp/csComp.js",
     "ignore": [
-        "dist/csServerComp",
         "csComp",
         "csServerComp",
         "example",
         "docs",
         "test",
         "bower.json",
         "gulp.js",
+        "Dockerfile",
         "package.json",
         "README.md",
         ".bithoundrc",
@@ -58,5 +58,9 @@
       "underscore": "~1.7.0"
     },
     "devDependencies": {
+    },
+    "resolutions": {
+      "angular": "~1.4.4",
+      "d3": "~3.5.5"
     }
 }
diff --git a/example/package.json b/example/package.json
@@ -37,7 +37,7 @@
     "xml2js": "^0.4.9"
   },
   "devDependencies": {
-    "coveralls": "^2.11.2",
+    "coveralls": "^2.11.4",
     "del": "^1.2.0",
     "gulp": "^3.9.0",
     "gulp-angular-templatecache": "^1.6.0",