diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-11-19 15:26:08 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-11-19 15:26:08 -0500 |
| commit | 84092f3d051c7d8904a63d38c81eb5f671b6e71b (patch) | |
| tree | f46e2445757354aca51c46fe94e8b66fde943ecc /includes/bootstrap.inc | |
| parent | 76faa7de48e759cff770269c25d6ed6f92cf6b29 (diff) | |
| parent | 81586d9e9d04dcee487c50de426c04221899b6d0 (diff) | |
| download | brdo-84092f3d051c7d8904a63d38c81eb5f671b6e71b.tar.gz brdo-84092f3d051c7d8904a63d38c81eb5f671b6e71b.tar.bz2 | |
Merge tag '7.34' into 7.x
7.34 release
Conflicts:
CHANGELOG.txt
includes/bootstrap.inc
Diffstat (limited to 'includes/bootstrap.inc')
| -rw-r--r-- | includes/bootstrap.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index b6c531c3b..9f37dfcf1 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.34-dev'); +define('VERSION', '7.35-dev'); /** * Core API compatibility. |