Skip to content

Commit

Permalink
Merge branch '1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Marlinc committed Feb 23, 2016
2 parents 3abe582 + 36ca800 commit fd78b99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.0
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"require": {
"cakephp/cakephp": "3.*",
"muffin/webservice": "dev-master"
"muffin/webservice": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
Expand Down

0 comments on commit fd78b99

Please sign in to comment.