Miriam Baglioni cc68855a1e merge upstream		2020-10-27 15:54:16 +01:00
..
application	resolved conflicts	2020-04-29 11:41:31 +02:00
common	added connection timeout and socket timeout 600 sec	2020-10-27 15:53:02 +01:00
model/mdstore	resolved conflicts	2020-04-29 11:41:31 +02:00
oa/merge	solved bug on merge publication	2020-10-21 22:41:55 +02:00
parser/utility	resolved conflicts	2020-04-29 11:41:31 +02:00
utils	code formatting	2020-10-02 09:43:24 +02:00