Diamantis Tziotzios 85bdb7fad1 Merge branch 'Development' ... # Conflicts: # dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java		2018-02-12 10:23:41 +02:00
dmp-admin	available profiles	2018-02-08 10:50:39 +02:00
dmp-backend	Merge branch 'Development'	2018-02-12 10:23:41 +02:00
dmp-db-scema	added foreign keys	2017-11-17 00:13:39 +01:00
dmp-frontend	Merge branch 'Development'	2018-02-12 10:23:41 +02:00
dmp-javascript-engine	Initial import of DMP project modules.	2017-09-14 13:43:44 +03:00
.gitignore	no message	2018-01-26 17:49:17 +02:00
package-lock.json	new http call , fieldgroups	2017-09-18 13:18:17 +03:00