Vojtech Szocs has submitted this change and it was merged. Change subject: branding: Do not require style sheet files ...................................................................... branding: Do not require style sheet files - Removed requirement that style sheet files must be defined in branding.properties. - Fixed issue where if a welcome page template would access a key that wasn't defined in the properties file it would cause a npe. Change-Id: I6e2b60060557ce15b255d5f30b216d5715b3d095 Signed-off-by: Alexander Wels <awels@redhat.com> --- M README.branding M backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java M backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag M packaging/branding/ovirt.brand/branding.properties 4 files changed, 9 insertions(+), 8 deletions(-) Approvals: Vojtech Szocs: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/21239 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e2b60060557ce15b255d5f30b216d5715b3d095 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <awels@redhat.com> Gerrit-Reviewer: Alexander Wels <awels@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayilsa@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server