pom.xml · b69eca68e43005e17affab5777128a1de1752e0f · eDelivery / SMP

5 years ago

Merge branch 'development' of... · 71a66632

Joze RIHTARSIC authored 5 years ago

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into bugfix/EDELIVERY-5001-ebcorepartyid-on-ui

# Conflicts:
#	smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
#	smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java

71a66632

History

Merge branch 'development' of...

Joze RIHTARSIC authored 5 years ago

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into bugfix/EDELIVERY-5001-ebcorepartyid-on-ui

# Conflicts:
#	smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
#	smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java

Code owners

Assign users and groups as approvers for specific file changes. Learn more.

pom.xml 10.26 KiB