Merge branch 'release/1.8.14' into develop

This commit is contained in:
bnu 2015-11-09 16:15:22 +09:00
commit ca0fb36fb8
5 changed files with 5 additions and 5 deletions

View file

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -16,7 +16,7 @@
<action name="procCommunicationSendMessage" type="controller" ruleset="sendMessage" standalone="true" />
<action name="procCommunicationStoreMessage" type="controller" standalone="true" />
<action name="procCommunicationDeleteMessage" type="controller" standalone="true" />
<action name="procCommunicationDeleteMessages" type="controller" standalone="true" />
<action name="procCommunicationDeleteMessages" type="controller" method="GET|POST" standalone="true" />
<action name="procCommunicationAddFriend" type="controller" ruleset="addFriend" standalone="true" />
<action name="procCommunicationMoveFriend" type="controller" ruleset="deleteCheckedFriend" standalone="true" />

File diff suppressed because one or more lines are too long