fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-18 01:42:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
akasima 2014-07-21 12:34:33 +09:00
commit d24ff73619
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/object/Object.class.php
View file

@ -165,7 +165,7 @@ class Object
}
/**
* Method to retrieve an object containing a key/value paris
* Method to retrieve an object containing a key/value pairs
*
* @return Object Returns an object containing key/value pairs
*/

2
config/config.inc.php
View file

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