Diamantis Tziotzios e64e4e50aa Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development ... # Conflicts: # dmp-frontend/src/assets/lang/en.json		2017-12-18 15:47:46 +02:00
..
data-management-plan	no message	2017-12-14 19:13:28 +02:00
dataset	dataset criteria	2017-12-18 13:26:13 +02:00
project	no message	2017-12-18 15:45:36 +02:00
BaseCriteria.ts	no message	2017-12-18 15:45:36 +02:00
BaseCriteriaErrorModel.ts	no message	2017-12-18 15:45:36 +02:00