Browse Source

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

flowchartTest
Alex de Mulder 9 years ago
parent
commit
ab04dfd944
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      bower.json
  2. +1
    -1
      package.json

+ 1
- 1
bower.json View File

@ -4,7 +4,7 @@
"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/",
"license": ["Apache-2.0", "MIT"],
"license": "(Apache-2.0 OR MIT)",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/almende/vis.git" "url": "git://github.com/almende/vis.git"

+ 1
- 1
package.json View File

@ -3,7 +3,7 @@
"version": "4.0.1-SNAPSHOT", "version": "4.0.1-SNAPSHOT",
"description": "A dynamic, browser-based visualization library.", "description": "A dynamic, browser-based visualization library.",
"homepage": "http://visjs.org/", "homepage": "http://visjs.org/",
"license": ["Apache-2.0", "MIT"],
"license": "(Apache-2.0 OR MIT)",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/almende/vis.git" "url": "git://github.com/almende/vis.git"

Loading…
Cancel
Save