Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cheton committed Feb 14, 2016
2 parents 5d99de5 + e98487e commit e5fcb04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "cncjs",
"version": "0.15.5",
"version": "0.15.6",
"description": "CNC.js is a web-based CNC milling controller for the Arduino running GRBL",
"dependencies": {
"html5shiv": "~3.7.3",
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "cncjs",
"version": "0.15.5",
"version": "0.15.6",
"description": "CNC.js is a web-based CNC milling controller for the Arduino running GRBL",
"homepage": "https://github.com/cheton/cnc.js",
"author": "Cheton Wu <cheton@gmail.com>",
Expand Down

0 comments on commit e5fcb04

Please sign in to comment.