Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 71a66632 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Merge branch 'development' of... 

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
parents 776eeccc e15686f7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 113 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about