diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
commit | be37104ac63cd25f2eac831ca03d6d2b19976e1c (patch) | |
tree | 5b168134f2b07933831daedd8cf2641ffb6c5c7d /version.php | |
parent | d45a24be28b2eb2d0c2731708b589788a5b87215 (diff) | |
download | elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.gz elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.bz2 |
Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged due to standardization of code in trunk but not branch)
git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'version.php')
-rw-r--r-- | version.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.php b/version.php index 60ce3d11b..a9aa992c6 100644 --- a/version.php +++ b/version.php @@ -12,7 +12,7 @@ // YYYYMMDD = Elgg Date // XX = Interim incrementer -$version = 2010070301; +$version = 2010071002; // Human-friendly version name $release = '1.8-svn'; |