Merge branch 'hotfix/1.7.12' into develop

Conflicts:
	config/config.inc.php
This commit is contained in:
bnu 2015-03-18 15:50:34 +09:00
commit ee8cc665cf
5 changed files with 33 additions and 1 deletions

View file

@ -35,6 +35,8 @@ define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
define('__XE_VERSION_STABLE__', (!__XE_VERSION_ALPHA__ && !__XE_VERSION_BETA__ && !__XE_VERSION_RC__));
define('__XE_MIN_PHP_VERSION__', '5.3.0');
/**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
*/