Miriam Baglioni 4cf4454341 changed from deprecated method to new one		2020-10-27 17:46:19 +01: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	changed from deprecated method to new one	2020-10-27 17:46:19 +01:00
message	cleanup	2020-04-29 19:09:07 +02:00
scholexplorer/relation	resolved conflicts	2020-04-29 11:41:31 +02:00