Skip to content
GitLab
Explore
Sign in
imixs
imixs-office-workflow
Repository
imixs-office-workflow
imixs-office-workflow-web
pom.xml
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into archive-feature
· 65f483c0
Ralph Soika
authored
Dec 23, 2017
Conflicts: imixs-office-workflow-ejb/src/main/resources/imixs.properties pom.xml
65f483c0