Merge tag '7.29' into 7.x

7.29 release Conflicts: includes/bootstrap.inc Conflicts: CHANGELOG.txt includes/bootstrap.inc
kalamuna · Jul 28, 2014 · 82ad452 · 82ad452
1 parent 8fbe7a8
commit 82ad452
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,5 @@
 
-Drupal 7.29, xxxx-xx-xx (development version)
+Drupal 7.30, xxxx-xx-xx (development version)
 -----------------------
 
 Drupal 7.29, 2014-07-16

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.29-dev');
+define('VERSION', '7.30-dev');
 
 /**
  * Core API compatibility.