Merge remote-tracking branch 'origin/master'

Evolveum · Sep 18, 2017 · 51779eb · 51779eb
2 parents d18042b + d1d588f
commit 51779eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3789,4 +3789,4 @@ AbstractPolicyConstraintType.enforcement=Enforcement
 ExclusionPolicyConstraintType.targetRef=Target reference
 ExclusionPolicyConstraintType.policy=Policy
 ExclusionPolicyConstraintPanel.exclusionTitle=Exclusion
-
+comboInput.nullValid=Choose one