Merge pull request #482 from fazo96/master

Allow using moment 2.10 and bootstrap 3.3.4 with bower
Serhioromano · Apr 26, 2015 · 4ba1ff2 · 4ba1ff2
2 parents 84cfcd2 + 730d4a6
commit 4ba1ff2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -12,8 +12,8 @@
   ],
   "dependencies": {
     "jquery": "~1.10.2",
-    "bootstrap": "~2.3.1",
+    "bootstrap": "~2.3.1 || ~3.3.4",
     "underscore": "~1.4.4",
-    "moment": "~2.0.0"
+    "moment": "2.x"
   }
 }