Commits

Andrejs Griščenko authored 1c200e5812eM
.......... [ZBX-20021] updated to the latest from master; resolved conflicts in: - ui/include/classes/api/services/CMediatype.php
Showing diff toc4b99c8c821
Everything looks good. We'll let you know here if there's anything you should know about.