Miriam Baglioni e723513fac added merge forh2020topiccode and h2020topicdescription. Removed merge for funded amount.		2021-05-21 13:20:43 +02:00
..
action	merging from master branch	2021-04-23 13:01:19 +02:00
common	applied intellij code cleanup	2021-05-14 11:06:24 +02:00
dump/oaf	changed originalId to acronym	2021-05-20 11:09:44 +02:00
mdstore	MDStoreManager model classes imported from dnet-hadoop project	2021-05-10 14:02:18 +02:00
oaf	added merge forh2020topiccode and h2020topicdescription. Removed merge for funded amount.	2021-05-21 13:20:43 +02:00
orcid	merging from stable_ids branch	2021-04-23 14:03:59 +02:00
scholexplorer	merging from stable_ids branch	2021-04-23 14:03:59 +02:00