Commits
Martins Talbergs authored 00d42637a2bM
.......... [DEV-1695] updated to latest from ^origin/release/5.0 Conflicts: ui/app/views/administration.image.list.php ui/app/views/js/administration.iconmap.edit.js.php ui/include/forms.inc.php ui/include/views/monitoring.sysmap.edit.php
Showing diff tocc91da740c1