Merge branch 'master' of https://github.com/novus/nvd3

Conflicts: bower.json
11 years ago · d2751d839e
parent 03441be565 59399a6967
commit d2751d839e
1 changed files with 1 additions and 1 deletions
--- a/bower.json
+++ b/bower.json
@ -20,7 +20,7 @@
  "dependencies": {
    "d3": "3.3.5"
  },
-  "ignore": [
+  "ignore" : [
    "**/.*",
    "node_modules",
    "bower_components",