[midPoint-git] [Evolveum/midpoint] 89c529: Fix ClassMapper conflict
Tadeas Chrapovic
noreply at github.com
Mon Aug 28 19:00:02 CEST 2023
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 89c529e106fed5a24dda24bd9b038008e2480629
https://github.com/Evolveum/midpoint/commit/89c529e106fed5a24dda24bd9b038008e2480629
Author: tchrapovic <chrapovic.tadeas at gmail.com>
Date: 2023-08-28 (Mon, 28 Aug 2023)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
Log Message:
-----------
Fix ClassMapper conflict
Commit: e385bd16bec08824bca9074a10e303b2cb65a033
https://github.com/Evolveum/midpoint/commit/e385bd16bec08824bca9074a10e303b2cb65a033
Author: tchrapovic <chrapovic.tadeas at gmail.com>
Date: 2023-08-28 (Mon, 28 Aug 2023)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/f946624ad796...e385bd16bec0
More information about the midPoint-svn
mailing list