Merge branch 'develop' of https://git.okayapps.com/wanghk/bpm
# Conflicts: # pom.xml
Showing
src/main/java/com/bbd/bpm/domain/User.java
0 → 100644
src/main/resources/logback.xml
deleted
100644 → 0
src/main/resources/processes/test.bpmn
0 → 100644
src/main/resources/processes/test2.bpmn
0 → 100644
src/main/resources/processes/test3.bpmn
0 → 100644
src/main/resources/processes/test4.bpmn
0 → 100644
src/main/resources/templates/form.html
0 → 100644
src/main/resources/templates/index.html
0 → 100644
src/main/resources/templates/login.html
0 → 100644
Please
register
or
sign in
to comment