summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-06-29 18:22:59 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-06-29 18:22:59 -0700
commit12d33253b64efdb42ad5ffaefb98ff128f49a898 (patch)
tree732a50adb8a437e1db6305fccb314d53b3cfd963
parentd8cfe088697631a9789895b4128b12ab79c07207 (diff)
downloadbrdo-12d33253b64efdb42ad5ffaefb98ff128f49a898.tar.gz
brdo-12d33253b64efdb42ad5ffaefb98ff128f49a898.tar.bz2
Back to 7.x-dev
-rw-r--r--CHANGELOG.txt3
-rw-r--r--includes/bootstrap.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c859f028d..2522289d6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,7 @@
+Drupal 7.5-dev, xxxx-xx-xx (development version)
+----------------------
+
Drupal 7.4, 2011-06-29
----------------------
- Rolled back patch that caused fatal errors in CTools, Feeds, and other modules using the class registry.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 35a20c880..9f4eab0d8 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.4');
+define('VERSION', '7.5-dev');
/**
* Core API compatibility.