diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
| commit | 310940b824eff4a116dcd72ccd339bb602021981 (patch) | |
| tree | 19f6efc7b30b9456eebc26d578c5dc7e125bb6e7 /wp-includes/version.php | |
| parent | 616f7399dc4c4f7c56951c7b87a7aa91b3e690a3 (diff) | |
Merge with branches/2.5 in WordPress, revision 8066
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/version.php')
| -rw-r--r-- | wp-includes/version.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/version.php b/wp-includes/version.php index 9e29068..d2aa5cc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -8,7 +8,7 @@ * * @global string $wp_version */ -$wp_version = '2.5.1'; +$wp_version = '2.5.2-alpha'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB scheme @@ -16,7 +16,7 @@ $wp_version = '2.5.1'; * * @global int $wp_db_version */ -$wp_db_version = 7796; +$wp_db_version = 7935; -$wpmu_version = '1.5.1'; +$wpmu_version = '1.5.2-alpha'; ?> |