Commits
Andrejs Griščenko authored 701bf0679afM
.......... [DEV-1385] updated to the latest from master; resolved conflicts in: - frontends/php/app/controllers/CControllerDashboardView.php - frontends/php/app/controllers/CControllerWidgetNavTreeItemEdit.php - frontends/php/app/controllers/CControllerWidgetNavTreeItemUpdate.php - frontends/php/app/controllers/CControllerWidgetNavTreeView.php - frontends/php/include/classes/helpers/CJs.php - frontends/php/include/classes/html/CNavigationTree.php - frontends/php/include/classes/json/CJson.php
Showing diff toaf6e033441a