Merge remote-tracking branch 'origin/master'

This commit is contained in:
Johannes Theiner 2016-07-09 13:14:59 +02:00
commit c99b1e0a01
1 changed files with 1 additions and 1 deletions

View File

@ -26,7 +26,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<version>2.2.1</version>
<configuration>
<archive>
<manifest>