Skip to content

Commit

Permalink
Merge branch 'master' into v1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
fengqi committed Apr 7, 2017
2 parents 3eab345 + ca7c1d1 commit b3d6e0a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": ">5.2.0",
"php": ">=5.2.0",
"awheel/framework": "^1.5",
"smarty/smarty": "^3.1"
},
Expand Down

0 comments on commit b3d6e0a

Please sign in to comment.