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

10 years ago · 385777c6c1
--- a/HISTORY.md
+++ b/HISTORY.md
@ -2,7 +2,7 @@
 http://visjs.org


 ## not yet released, version 3.7.3-SNAPSHOT
 ## 20145-01-09, version 3.8.0

 ### General

--- a/+ 1
+++ b/+ 1
@ -1,6 +1,6 @@
 The MIT License (MIT)

 Copyright (c) 2014 Almende B.V.
 Copyright (c) 2014-2015 Almende B.V.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/+ 1
+++ b/+ 1
@ -1,5 +1,5 @@
 Vis.js
 Copyright 2010-2014 Almende B.V.
 Copyright 2010-2015 Almende B.V.

 Vis.js is dual licensed under both

--- a/README.md
+++ b/README.md
@ -287,7 +287,7 @@ Then run the tests:

 ## License

 Copyright (C) 2010-2014 Almende B.V.
 Copyright (C) 2010-2015 Almende B.V.

 Vis.js is dual licensed under both

--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
  "name": "vis",
  "version": "3.7.3-SNAPSHOT",
  "version": "3.8.0",
  "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": "3.7.2-SNAPSHOT",
  "version": "3.8.0",
  "description": "A dynamic, browser-based visualization library.",
  "homepage": "http://visjs.org/",
  "repository": {