Merge branch 'master' of https://github.com/jerkar/jerkar.git
Conflicts: org.jerkar.core/build/def/org/jerkar/AbstractBuild.java
.travis.yml
0 → 100644
This diff is collapsed.
build.xml
0 → 100644
Conflicts: org.jerkar.core/build/def/org/jerkar/AbstractBuild.java