diff options
| author | David Rothstein <drothstein@gmail.com> | 2013-03-06 19:09:31 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2013-03-06 19:09:31 -0500 |
| commit | 63fc6b8f75663588327cec1f645a1826c75f4400 (patch) | |
| tree | ebddcb2fbfdef700ebf15a5cadfac24ec6cb0800 /includes | |
| parent | 0a9cd357b43bdb0c0c7e574a15975e662f855d8d (diff) | |
| parent | ec59e1197a2aa37557f9a87f13ba4d90e6aabf4c (diff) | |
| download | brdo-63fc6b8f75663588327cec1f645a1826c75f4400.tar.gz brdo-63fc6b8f75663588327cec1f645a1826c75f4400.tar.bz2 | |
Merge branch '7.20-hotfix' into 7.x
Conflicts:
CHANGELOG.txt
includes/bootstrap.inc
Diffstat (limited to 'includes')
| -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 01db7a6af..c6c98ecb6 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.21-dev'); +define('VERSION', '7.22-dev'); /** * Core API compatibility. |