Diamantis Tziotzios bfc6b63067 Merge branch 'Development' ... # Conflicts: # dmp-backend/src/main/java/rest/entities/DMPs.java # dmp-backend/src/main/java/rest/entities/DataRepositories.java # dmp-backend/src/main/java/rest/entities/DatasetProfiles.java # dmp-backend/src/main/java/rest/entities/Datasets.java # dmp-backend/src/main/java/rest/entities/DmpProfiles.java # dmp-backend/src/main/java/rest/entities/Organisations.java # dmp-backend/src/main/java/rest/entities/Projects.java # dmp-backend/src/main/java/rest/entities/Registries.java # dmp-backend/src/main/java/rest/entities/Researchers.java # dmp-backend/src/main/java/rest/entities/Services.java # dmp-backend/src/main/java/rest/entities/Users.java # dmp-frontend/src/app/app.component.ts # dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts # dmp-frontend/src/assets/custom.js # dmp-frontend/src/index.html		2018-01-18 12:45:51 +02:00
..
main	Merge branch 'Development'	2018-01-18 12:45:51 +02:00
test/resources	Merge branch 'Development'	2018-01-18 12:45:51 +02:00