summaryrefslogtreecommitdiffstats
path: root/wp-includes/version.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-15 17:22:59 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-15 17:22:59 +0000
commit1d6b7c9a990f68f0f9b599d61678c71d40251704 (patch)
tree8f6f5206f365be2062ff98c3be887d47899b1a2a /wp-includes/version.php
parenta8a5dc5214b92fc26003983f599dd25e88660084 (diff)
downloadwordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.gz
wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.xz
wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.zip
WP Merge with rev 8339
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1374 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/version.php')
-rw-r--r--wp-includes/version.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f79f045..b19e143 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -8,7 +8,7 @@
*
* @global string $wp_version
*/
-$wp_version = '2.6-beta3';
+$wp_version = '2.6';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@@ -17,5 +17,5 @@ $wp_version = '2.6-beta3';
*/
$wp_db_version = 8201;
-$wpmu_version = '2.6-beta1';
+$wpmu_version = '2.6';
?>