Merge branch 'edit-inv-page' into upstream_master

Conflicts: awx/ui/static/js/controllers/Inventories.js awx/ui/static/js/lists/InventoryHosts.js
2026-05-14 07:48:39 -05:00 · 2015-03-12 15:37:19 -04:00
parent 31dc43d669 5e22c86c45
commit 333adea673
8 changed files with 197 additions and 27 deletions
@@ -141,7 +141,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                icon = 'fa-check-square-o';
                break;
            case 'properties':
-                icon = "fa-wrench";
+                icon = "fa-pencil";
                break;
            case 'reset':
                icon = "fa-undo";