dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Stian Sandvold (stian-sandvold)
------------------------------------------------------------
revno: 20330 [merge]
committer: Stian Sandvold <stian.sandvold@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-23 23:49:22 +0200
message:
  Merge with trunk
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-09-16 15:14:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-09-22 14:36:20 +0000
@@ -109,6 +109,8 @@
     String KEY_CORS_WHITELIST = "keyCorsWhitelist";
     String KEY_REQUIRE_ADD_TO_VIEW = "keyRequireAddToView";
     String KEY_ALLOW_OBJECT_ASSIGNMENT = "keyAllowObjectAssignment";
+    String KEY_USE_CUSTOM_LOGO_FRONT = "keyUseCustomLogoFront";
+    String KEY_USE_CUSTOM_LOGO_BANNER = "keyUseCustomLogoBanner";
     
     String KEY_DATA_IMPORT_STRICT_PERIODS = "keyDataImportStrictPeriods";
     String KEY_DATA_IMPORT_STRICT_CATEGORY_OPTION_COMBOS = "keyDataImportStrictCategoryOptionCombos";