Commits
Ginta Berzina authored 16eb3a56c92M
.......... [DEV-4580] updated to latest from master; resolved conflicts in - ui/app/controllers/CControllerItemCreate.php - ui/app/controllers/CControllerItemPrototypeCreate.php - ui/app/controllers/CControllerItemPrototypeUpdate.php - ui/app/controllers/CControllerItemUpdate.php
Showing diff toc30cf5aee79