Merge branch 'develop' into develop_fit

9 years ago · c3ac96d944
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,7 +1,7 @@
 # vis.js history
 http://visjs.org

 ## UNRELEASED, version 4.0.1
 ## 2015-05-28, version 4.1.0

 ### Network

--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
  "name": "vis",
  "version": "4.0.1-SNAPSHOT",
  "version": "4.1.1-SNAPSHOT",
  "main": ["dist/vis.min.js", "dist/vis.min.css"],
  "description": "A dynamic, browser-based visualization library.",
  "homepage": "http://visjs.org/",
--- a/dist/vis.js
+++ b/dist/vis.js
--- a/dist/vis.map
+++ b/dist/vis.map
--- a/dist/vis.min.js
+++ b/dist/vis.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "vis",
  "version": "4.0.1-SNAPSHOT",
  "version": "4.1.1-SNAPSHOT",
  "description": "A dynamic, browser-based visualization library.",
  "homepage": "http://visjs.org/",
  "license": "(Apache-2.0 OR MIT)",