Commits
Alexander Shubin authored a42afe28024M
.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in: # ui/include/classes/api/services/CConfiguration.php # ui/include/classes/core/ZBase.php # ui/include/classes/import/converters/C62ImportConverter.php
Showing diff tof0ae83c9c6a