Commits

Janis Freibergs authored e7a77f7930d
.......... [ZBX-22724] transferred changes from 6.0 branch; resolved conflicts - CConfigurationExport.php - items.inc.php
Everything looks good. We'll let you know here if there's anything you should know about.