Merge branch 'develop' into crazymerge

This commit is contained in:
Kijin Sung 2015-12-09 13:13:02 +09:00
commit 470e4f2a7a
5 changed files with 43 additions and 55 deletions

View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.8.14');
define('__XE_VERSION__', '1.8.15');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));