diff options
| author | Valdis Murzins <valdis.murzins@zabbix.com> | 2021-05-06 11:17:40 +0300 |
|---|---|---|
| committer | Valdis Murzins <valdis.murzins@zabbix.com> | 2021-05-06 11:17:40 +0300 |
| commit | ab8169f2d5339aaf9c72ebb1d1d803606f8cdc17 (patch) | |
| tree | e7eddd4556452203f36a59d8e586a42f48f56b38 /ChangeLog.d | |
| parent | 255317c7c3fa5327c16a18fe89a83d226ce7caaf (diff) | |
| parent | 55816926f51e84fef20f91fbb96a6c3b46f60450 (diff) | |
A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in:
- sass/stylesheets/sass/screen.scss
- ui/include/classes/mvc/CRouter.php
- ui/include/classes/validators/CApiInputValidator.php
- ui/include/defines.inc.php
- ui/screenconf.php
- ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Diffstat (limited to 'ChangeLog.d')
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-19306 | 1 | ||||
| -rw-r--r-- | ChangeLog.d/feature/ZBXNEXT-6592 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-19306 b/ChangeLog.d/bugfix/ZBX-19306 new file mode 100644 index 00000000000..b21a63ab98b --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-19306 @@ -0,0 +1 @@ +..F....... [ZBX-19306] fixed broken item configuration link in latest data results (miks) diff --git a/ChangeLog.d/feature/ZBXNEXT-6592 b/ChangeLog.d/feature/ZBXNEXT-6592 new file mode 100644 index 00000000000..b224a1b3219 --- /dev/null +++ b/ChangeLog.d/feature/ZBXNEXT-6592 @@ -0,0 +1 @@ +.........T [ZBXNEXT-6592] added ManageEngine ServiceDesk media (tuskov) |