aboutsummaryrefslogtreecommitdiff
path: root/version.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-18 21:19:11 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-18 21:19:11 +0000
commit53305ecf5ccd83618faebedb1ae9ef8e0ce61d8c (patch)
treeebc0a4461f498fe77156c3679f3c24df78a3d0c7 /version.php
parent677e155a31776c63fbd5701f76302e422a0dadb9 (diff)
downloadelgg-53305ecf5ccd83618faebedb1ae9ef8e0ce61d8c.tar.gz
elgg-53305ecf5ccd83618faebedb1ae9ef8e0ce61d8c.tar.bz2
Merged r6506:6509 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6516 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'version.php')
-rw-r--r--version.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.php b/version.php
index 11a678d5b..6fc5f8f50 100644
--- a/version.php
+++ b/version.php
@@ -12,7 +12,7 @@
// YYYYMMDD = Elgg Date
// XX = Interim incrementer
-$version = 2010060401;
+$version = 2010061501;
// Human-friendly version name
$release = '1.8-svn';