summaryrefslogtreecommitdiff
path: root/includes/bootstrap.inc
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2014-10-15 11:38:18 -0400
committerDavid Rothstein <drothstein@gmail.com>2014-10-15 11:38:18 -0400
commitb4844afdcadbaa7e4f3ad9a237f17126b94dc483 (patch)
treed402b658862e2d9ac82724702a39f97b5779f8fe /includes/bootstrap.inc
parentf2c8d9550ec95b207dde99f45050b81337ae0065 (diff)
parent131a6f5129b18f3913ba5882111797f8588c5aaf (diff)
downloadbrdo-b4844afdcadbaa7e4f3ad9a237f17126b94dc483.tar.gz
brdo-b4844afdcadbaa7e4f3ad9a237f17126b94dc483.tar.bz2
Merge tag '7.32' into 7.x
7.32 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 e15f57be1..75a1a5dee 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.32-dev');
+define('VERSION', '7.33-dev');
/**
* Core API compatibility.