summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rothstein2012-11-07 21:47:16 (GMT)
committer David Rothstein2012-11-07 21:47:16 (GMT)
commit8204a8b49474bf9590128879c21ec75f33063f46 (patch)
treef57385f922cb222eb386cb7cf14bee17b2e7c89a
parentc5d6e6334fb7a71ecf1dbc7e06a7de8ad9547b27 (diff)
Back to 7.x-dev
-rw-r--r--CHANGELOG.txt2
-rw-r--r--includes/bootstrap.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 94522f5..0e3988d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+Drupal 7.18, xxxx-xx-xx (development version)
+-----------------------
Drupal 7.17, 2012-11-07
-----------------------
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index c9b17fe..74853b2 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.17');
+define('VERSION', '7.18-dev');
/**
* Core API compatibility.