Merge branch '3.1'

This commit is contained in:
Sean Harvey 2013-07-30 14:43:37 +12:00
commit 24892c6b66

View File

@ -12,9 +12,5 @@
"dev-master": "3.2.x-dev"
}
},
"scripts": {
"post-install-cmd": "php ./framework/cli-script.php dev/build",
"post-update-cmd": "php ./framework/cli-script.php dev/build"
},
"minimum-stability": "dev"
}