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

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

Merge branch 'development' of... 

Merge branch 'development' of https://ec.europa.eu/digital-building-blocks/code/scm/edelivery/smp into feature/EDELIVERY-8803-alert-management-password-policy

 Conflicts:
	smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
	smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadata.java
parents 430f88df 21351e3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 91 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