Merge remote-tracking branch 'origin/develop' into develop

2015-01-23 10:39:24 +01:00 · 2015-01-23 10:39:24 +01:00 · f1e49c2ad0
parent 82e4627e0e 19cbdd03f7
commit f1e49c2ad0
1 changed files with 4 additions and 1 deletions
--- a/bower.json
+++ b/bower.json
@ -13,7 +13,10 @@
    "type": "git",
    "url": "https://github.com/josdejong/jsoneditor.git"
  },
-  "main": "jsoneditor.min.js",
+  "main": [
+    "jsoneditor.min.js", 
+    "jsoneditor.css"
+  ],
  "bugs": "https://github.com/josdejong/jsoneditor/issues",
  "ignore": [
    "app",