Merge branch 'master' of
https://code-repo.d4science.org/gCubeSystem/workspace-widget-portlet.git Conflicts: pom.xml
This commit is contained in:
commit
1004068c8f
https://code-repo.d4science.org/gCubeSystem/workspace-widget-portlet.git Conflicts: pom.xml