summaryrefslogtreecommitdiff
path: root/includes/bootstrap.inc
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2014-08-06 13:15:28 -0400
committerDavid Rothstein <drothstein@gmail.com>2014-08-06 13:15:28 -0400
commitb6d84a81aa5ab264076cfccc789915fe98113798 (patch)
tree07887ed7ddbaff3ad44f1fee8e0e7d8df173496b /includes/bootstrap.inc
parent7ca0dfe310ed4f7e5cfc86eb554245b0434ed704 (diff)
parent90e884ad0f7f2cf269d953f7d70966de9fd821ff (diff)
downloadbrdo-b6d84a81aa5ab264076cfccc789915fe98113798.tar.gz
brdo-b6d84a81aa5ab264076cfccc789915fe98113798.tar.bz2
Merge tag '7.31' into 7.x
7.31 release Conflicts: CHANGELOG.txt includes/bootstrap.inc
Diffstat (limited to 'includes/bootstrap.inc')
-rw-r--r--includes/bootstrap.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 7e0353349..9e9ced2a5 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.31-dev');
+define('VERSION', '7.32-dev');
/**
* Core API compatibility.