• dtziotzios's avatar
    Merge branch 'Development' · d971f02a
    dtziotzios authored
    # Conflicts:
    #	dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
    #	dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
    d971f02a
Name
Last commit
Last update
..
e2e Loading commit data...
src Loading commit data...
.dockerignore Loading commit data...
.editorconfig Loading commit data...
.gitignore Loading commit data...
Dockerfile Loading commit data...
README.md Loading commit data...
angular.json Loading commit data...
browserslist Loading commit data...
mime.types Loading commit data...
nginx-custom.conf Loading commit data...
nginx.conf Loading commit data...
package.json Loading commit data...
protractor.conf.js Loading commit data...
tsconfig.json Loading commit data...
tslint.json Loading commit data...