Skip to content
Snippets Groups Projects
Commit 1361cebf authored by Hugues.Cazeaux's avatar Hugues.Cazeaux
Browse files

Merge branch 'spring-data-rest' of 

https://CazUniGE@bitbucket.org/dlcmdev/dlcm-backend.git into
spring-data-rest

Conflicts:
	DLCM-PreIngest/src/main/java/ch/dlcm/model/Deposit.java
parent 1e12c493
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment