Merge branch 'development' of...
Merge branch 'development' of https://ec.europa.eu/digital-building-blocks/code/scm/edelivery/smp into feature/EDELIVERY-9498-urn-scheme-regular-expression Conflicts: changelog.txt smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMPPropertyEnum.java
No related branches found
No related tags found
Showing
- changelog.txt 3 additions, 3 deletionschangelog.txt
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMPPropertyEnum.java 1 addition, 2 deletions...uropa/ec/edelivery/smp/data/ui/enums/SMPPropertyEnum.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceMetadataService.java 2 additions, 0 deletions...c/edelivery/smp/services/ui/UIServiceMetadataService.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java 1 addition, 1 deletion...opa/ec/edelivery/smp/services/ui/UITruststoreService.java
Loading
Please register or sign in to comment