diff options
| author | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2021-01-06 16:38:19 +0300 |
|---|---|---|
| committer | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2021-01-06 16:38:19 +0300 |
| commit | f43defe6911518609a8a4fb95a9be532b6f43c53 (patch) | |
| tree | 7d02724a87030e264ffadf93c60a5d5e2be637f1 /include/zbxjson.h | |
| parent | bd1c2e4693dcd81afa6a0f29cad4057c527addd8 (diff) | |
| parent | b4bdbed8174bf5033eb26b3d37878c2057a99c25 (diff) | |
.......... [ZBXNEXT-6311,ZBXNEXT-6314] updated from lates master; fixed conflicts in:
- ui/include/html.inc.php
- ui/tests/selenium/testInheritanceTrigger.php
- ui/tests/selenium/common/testFormItemTest.php
Diffstat (limited to 'include/zbxjson.h')
| -rw-r--r-- | include/zbxjson.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zbxjson.h b/include/zbxjson.h index 03845eed492..2d0082d6bcc 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by |