Miriam Baglioni 959f30811e added connection timeout and socket timeout 600 sec		2020-10-16 10:52:30 +02:00
..
collector/worker/model	resolved conflicts	2020-04-29 11:41:31 +02:00
data/mdstore/manager/common/model	resolved conflicts	2020-04-29 11:41:31 +02:00
dhp	added connection timeout and socket timeout 600 sec	2020-10-16 10:52:30 +02:00
message	cleanup	2020-04-29 19:09:07 +02:00
scholexplorer/relation	resolved conflicts	2020-04-29 11:41:31 +02:00