Commits

Janis Freibergs authored c85cef744acM
.......... [DEV-3890] updated to latest from release/6.0; resolved conflicts in # ui/include/classes/api/services/CUser.php
Showing diff to87962b78feb
Everything looks good. We'll let you know here if there's anything you should know about.