Skip to content
Snippets Groups Projects
Commit 4f3a87f1 authored by ella's avatar ella
Browse files

Merge branch 'main' of https://dci-gitlab.cines.fr/dad/pacit.git into

main

Conflicts:
	src/main/java/fr/cines/pacit/Pacit.java
	src/main/java/fr/cines/pacit/transfer/impl/HttpTransferImpl.java
	src/main/java/fr/cines/pacit/transfer/impl/SubmissionTask.java
parents a4f7e769 39fd1e0e
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