Browse Source

Merge branch 'develop' into hammerjs2

Conflicts:
	package.json
flowchartTest
jos 10 years ago
parent
commit
bf9684da30
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      package.json

+ 1
- 1
package.json View File

@ -32,7 +32,7 @@
"hammerjs": "^2.0.4", "hammerjs": "^2.0.4",
"keycharm": "^0.1.6", "keycharm": "^0.1.6",
"moment": "^2.7.0", "moment": "^2.7.0",
"propagating-hammerjs": "^1.2.0"
"keycharm": "^0.2.0"
}, },
"devDependencies": { "devDependencies": {
"clean-css": "latest", "clean-css": "latest",

Loading…
Cancel
Save