summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-05-02 15:14:17 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2012-05-02 15:14:17 -0700
commita635a4969b9d0e3bfb1c808e59ac34988f61594e (patch)
treed2b9e78e56cd9eeca21e2d9a53a9cf565c77e59d
parent30d1e719aa5e9a9ad66514078ca3b0975ddadc9c (diff)
downloadbrdo-a635a4969b9d0e3bfb1c808e59ac34988f61594e.tar.gz
brdo-a635a4969b9d0e3bfb1c808e59ac34988f61594e.tar.bz2
Back to 7.x-dev
-rw-r--r--CHANGELOG.txt5
-rw-r--r--includes/bootstrap.inc2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 231618d0c..e3bc6ecf2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,9 @@
+Drupal 7.15, xxxx-xx-xx (development version)
+-----------------------
+
+
+
Drupal 7.14 2012-05-02
----------------------
- Fixed "integrity constraint" fatal errors when rebuilding registry.
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 2c60363dc..39452e075 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.14');
+define('VERSION', '7.15-dev');
/**
* Core API compatibility.