aboutsummaryrefslogtreecommitdiff
path: root/version.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-04 15:36:36 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-04 15:36:36 +0000
commitf4b1ebbe468e295d59bf7285b335aa51bcf132bb (patch)
tree517ed7919069d8a6c3fb34235b048a2bbab91e98 /version.php
parent559cae5d9035f65f12c1cc25cffe05880a2734c4 (diff)
downloadelgg-f4b1ebbe468e295d59bf7285b335aa51bcf132bb.tar.gz
elgg-f4b1ebbe468e295d59bf7285b335aa51bcf132bb.tar.bz2
Merge r6301:6338 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6356 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 bfa62f449..b8d0efc3f 100644
--- a/version.php
+++ b/version.php
@@ -12,7 +12,7 @@
// YYYYMMDD = Elgg Date
// XX = Interim incrementer
-$version = 2010052601;
+$version = 2010060101;
// Human-friendly version name
$release = '1.8-svn';