jrtechs
/
jrtechs-vis
mirror of https://github.com/jrtechs/vis.git
1
0
Fork 0
Code Issues 0 Releases 82 Wiki Activity
Browse Source

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

Conflicts:
	HISTORY.md
	dist/vis.js
v3_develop
Alex de Mulder 10 years ago
parent
ec8b53d938 d64f43c185
commit
b0749fbe34
5 changed files with 10 additions and 9 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      HISTORY.md
  2. +1
    -1
      bower.json
  3. +1
    -1
      dist/vis.map
  4. +5
    -5
      dist/vis.min.js
  5. +1
    -1
      package.json

+ 2
- 1
HISTORY.md View File

@ -1,7 +1,8 @@
# vis.js history # vis.js history
http://visjs.org http://visjs.org
## 2014-10-21, version 3.6.1
## not yet released, version 3.6.1
### Timeline ### Timeline

+ 1
- 1
bower.json View File

@ -1,6 +1,6 @@
{ {
"name": "vis", "name": "vis",
"version": "3.6.0",
"version": "3.6.1-SNAPSHOT",
"main": ["dist/vis.min.js", "dist/vis.min.css"], "main": ["dist/vis.min.js", "dist/vis.min.css"],
"description": "A dynamic, browser-based visualization library.", "description": "A dynamic, browser-based visualization library.",
"homepage": "http://visjs.org/", "homepage": "http://visjs.org/",

+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 5
- 5
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 1
- 1
package.json View File

@ -1,6 +1,6 @@
{ {
"name": "vis", "name": "vis",
"version": "3.6.0",
"version": "3.6.1-SNAPSHOT",
"description": "A dynamic, browser-based visualization library.", "description": "A dynamic, browser-based visualization library.",
"homepage": "http://visjs.org/", "homepage": "http://visjs.org/",
"repository": { "repository": {

Write Preview
Loading…
Cancel
Save