Merge branch 'develop' into jenkins

This commit is contained in:
Paul Campbell 2018-02-24 22:03:51 +00:00 committed by GitHub
commit 4af33d9d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,7 +27,7 @@
<relativePath/>
</parent>
<artifactId>conditional</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.4.0-SNAPSHOT</version>
<dependencies>
<dependency>