Commits
Gregory Chalenko authored 849a91f788fM
.......... [ZBXNEXT-8486] updated to latest master, partial update; resolved conflicts in: - ui/disc_prototypes.php - ui/include/views/configuration.item.edit.php - ui/include/views/configuration.item.prototype.edit.php - ui/items.php - ui/tests/selenium/items/testFormItem.php - ui/tests/selenium/items/testFormItemPrototype.php
Showing diff toced0e30543a