summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2012-08-01 12:33:18 -0400
committerDavid Rothstein <drothstein@gmail.com>2012-08-01 12:33:18 -0400
commit04ce5dcece1d888399281bdcec9fe1175329e568 (patch)
tree1026983dcc867d3d08813b99898a3141871d603f
parenta584af62514ba7ec37b82b0c7b17081fcca4c5e0 (diff)
downloadbrdo-04ce5dcece1d888399281bdcec9fe1175329e568.tar.gz
brdo-04ce5dcece1d888399281bdcec9fe1175329e568.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 09662cf88..ac15ca18d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,7 @@
+Drupal 7.16, xxxx-xx-xx (development version)
+-----------------------
+
Drupal 7.15, 2012-08-01
-----------------------
- Introduced a 'user_password_reset_timeout' variable to allow the 24-hour
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index b868fd330..753ecea43 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.15');
+define('VERSION', '7.16-dev');
/**
* Core API compatibility.