Learn more about cloning repositories
You have read-only access
.......... [ZBXNEXT-8880,ZBXNEXT-8977] updated origin to latest master; resolved conflicts in: -ui/app/controllers/CControllerAuthenticationUpdate.php; -ui/app/views/js/administration.authentication.edit.js.php; -ui/app/views/administration.authentication.edit.php; -ui/include/classes/api/services/CAuthentication.php; -ui/include/classes/helpers/CAuthenticationHelper.php
Everything looks good. We'll let you know here if there's anything you should know about.
