Skip to content
Snippets Groups Projects
Commit 0b281f5b authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

Merge branch 'iss1051-dataTransfer' of

https://code.it4i.cz/fiji/haas-java-client.git into iss1051-dataTransfer

Conflicts:
	haas-imagej-client/src/main/java/cz/it4i/fiji/haas/data_transfer/PersistentSynchronizationProcess.java
	haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/UpdatableBenchmarkJob.java
parents 34b10a2e efce91ef
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment