summaryrefslogtreecommitdiff
path: root/includes/bootstrap.inc
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-06-17 14:40:48 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-06-17 14:40:48 -0400
commit11cc2b0251d705b5bed981368fee038e5dddb0d1 (patch)
tree86e749eaa69c0eb8c7de0a29c18b91bd637eb7d6 /includes/bootstrap.inc
parentdc84091add715ca4abe4aa80fc32d27fe155ad4c (diff)
parent5cb79b4b217e9aa315d61284398cce132c28bea4 (diff)
downloadbrdo-11cc2b0251d705b5bed981368fee038e5dddb0d1.tar.gz
brdo-11cc2b0251d705b5bed981368fee038e5dddb0d1.tar.bz2
Merge tag '7.38' into 7.x
7.38 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 847bfc3a2..e2e133443 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.38-dev');
+define('VERSION', '7.39-dev');
/**
* Core API compatibility.