Merge branch 'develop' into next

This commit is contained in:
bnu 2015-02-09 11:22:02 +09:00
commit 2bbe9603a2
44 changed files with 420 additions and 311 deletions

View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.7.9');
define('__XE_VERSION__', '1.7.10');
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));