Code development platform for open source projects from the European Union institutions

Skip to content
  • Aleksandr Beliakov's avatar
    Merge commit 'f066153b' · 2e63615d
    Aleksandr Beliakov authored
    # Conflicts:
    #	Dockerfile
    #	dss-demo-bundle/pom.xml
    #	dss-demo-webapp/pom.xml
    #	dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/config/DSSBeanConfig.java
    #	dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/service/FOPService.java
    #	dss-demo-webapp/src/main/webapp/WEB-INF/thymeleaf/fragment/head.html
    #	dss-demo-webapp/src/test/resources/constraint.xml
    #	dss-esig-validation-tests/pom.xml
    #	dss-esig-validation-tests/src/test/java/eu/europa/esig/dss/validation/EsigValidationTest.java
    #	dss-esig-validation-tests/src/test/resources/constraint.xml
    #	dss-mock-tsa/pom.xml
    #	dss-rest-doc-generation/pom.xml
    #	dss-standalone-app-package/pom.xml
    #	dss-standalone-app/pom.xml
    #	dss-standalone-app/src/main/java/eu/europa/esig/dss/standalone/source/TrustedCertificateSourceLoader.java
    #	pom.xml
    #	sscd-mocca-adapter/pom.xml
    2e63615d
Loading