summaryrefslogtreecommitdiff
path: root/framework/PradoBase.php
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-05-27 13:55:58 +0000
committerChristophe.Boulain <>2009-05-27 13:55:58 +0000
commit7d15c048340cbcbd06cb9664b479d45906d2b0d8 (patch)
tree0af02875479def0e52d5ea1b6d11b5a276a477a6 /framework/PradoBase.php
parent5a87ceb5ce3a62aae92c344f670059971d5914d9 (diff)
parent9a87732ce51fd34e312ac63ed1ebec8d7fc1c16f (diff)
Merge from 3.2 branch.
Beginning of Prado 3.2 development
Diffstat (limited to 'framework/PradoBase.php')
-rw-r--r--framework/PradoBase.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index a08b54ba..084dd62b 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
*/
public static function getVersion()
{
- return '3.1.6-dev';
+ return '3.2-dev';
}
/**