diff options
author | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2022-10-12 16:06:46 +0300 |
---|---|---|
committer | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2022-10-12 16:06:46 +0300 |
commit | 191956ae165a983da482584834b1651665de3550 (patch) | |
tree | 816aa51c8b441d40137130b9fff3de05331724a6 /ui/include/defines.inc.php | |
parent | 978f3c886a7439f8aa7715fde34d104511925229 (diff) | |
parent | 4fa29ca38abaf72879824af7c4f5ca8a872ba57b (diff) |
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; resolved conflicts in:
# ui/disc_prototypes.php
# ui/include/views/configuration.item.prototype.edit.php
# ui/items.php
Diffstat (limited to 'ui/include/defines.inc.php')
-rw-r--r-- | ui/include/defines.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index ce35d9800bf..22534386acf 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -18,7 +18,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -define('ZABBIX_VERSION', '6.4.0beta1'); +define('ZABBIX_VERSION', '6.4.0beta2'); define('ZABBIX_API_VERSION', '6.4.0'); define('ZABBIX_EXPORT_VERSION', '6.4'); |