summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-10-21 15:49:51 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-10-21 15:49:51 -0400
commit12c09ce622468bd91b4e97ab052b7e84447af2f7 (patch)
treef7012a7bca0af533342844569ed75cd4bbc7e7b6 /includes
parent128e39ae7db0298102d48cdbbbba07f4584affd5 (diff)
parent9f72251c9291b5613acb9ca4ea7a51b4739e3f93 (diff)
downloadbrdo-12c09ce622468bd91b4e97ab052b7e84447af2f7.tar.gz
brdo-12c09ce622468bd91b4e97ab052b7e84447af2f7.tar.bz2
Merge tag '7.41' into 7.x
7.41 release Conflicts: CHANGELOG.txt includes/bootstrap.inc
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 5f67243c3..e9665eb40 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.41-dev');
+define('VERSION', '7.42-dev');
/**
* Core API compatibility.