Commits
Ivo Kurzemnieks authored 450790e30a5
.......... [ZBXNEXT-6199,ZBXNEXT-5969] updated to latest from /master, resolved conflicts and removed unnecessary code regarding timeout asterisk # Conflicts: # ui/include/views/configuration.host.discovery.edit.php # ui/include/views/configuration.item.edit.php # ui/include/views/configuration.item.prototype.edit.php