Merge develop into master

nicoespeon · Jul 9, 2018 · 29b64bd · 29b64bd
2 parents af99edf + 233d082
commit 29b64bd
Show file tree

Hide file tree

Showing 16 changed files with 1,062 additions and 854 deletions.
diff --git a/bower.json b/bower.json
@@ -1,11 +1,6 @@
 {
   "name": "gitgraph.js",
-  "version": "1.11.4",
-  "main": [
-    "./build/gitgraph.js",
-    "./build/gitgraph.css"
-  ],
-  "ignore": [
-    "**/.*"
-  ]
+  "version": "1.12.0",
+  "main": ["./build/gitgraph.js", "./build/gitgraph.css"],
+  "ignore": ["**/.*"]
 }