[midPoint-git] [Evolveum/midpoint] 9e0c0b: this had to be a cherry pick of commits from maste...
honchar
honchar at evolveum.com
Wed Jan 25 12:01:18 CET 2017
Branch: refs/heads/support-3.5
Home: https://github.com/Evolveum/midpoint
Commit: 9e0c0b7d838eae0c83e09fc8f323886ca6bbf2cf
https://github.com/Evolveum/midpoint/commit/9e0c0b7d838eae0c83e09fc8f323886ca6bbf2cf
Author: honchar <honchar at evolveum.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M infra/schema/pom.xml
M samples/model-client-sample/pom.xml
M tools/repo-ninja/pom.xml
Log Message:
-----------
this had to be a cherry pick of commits from master (1a56dd9, 67a118d, 53af3fd)
but due to merge conflicts, i just added all the changes manually
Subscription message in the footer
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
More information about the midPoint-svn
mailing list