Merge branch 'master' into feature/new-ws

Evolveum · Jan 24, 2020 · c8008ae · c8008ae
2 parents a91205d + 865b905
commit c8008ae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/repo/system-init/src/main/resources/midpoint-system.properties b/repo/system-init/src/main/resources/midpoint-system.properties
@@ -1,6 +1,6 @@
 # Copyright (c) 2010-2019 Evolveum and contributors
 #
-# This work is dual-licensed under the Apache License 2.0 
+# This work is dual-licensed under the Apache License 2.0
 # and European Union Public License. See LICENSE file for details.
 #
 # File generated during the build. This file contains various system properties such midPoint version, build ID, build timestamp and so on.
@@ -12,4 +12,4 @@ midpoint.system.branch=${git.branch}
 midpoint.system.buildTimestamp=${timestamp}
 midpoint.system.scm=${project.scm.connection}
 midpoint.system.jira=${project.issueManagement.url}
-midpoint.system.license=Apache License 2.0
+midpoint.system.license=Apache License 2.0 and European Union Public License