Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2016-01-12 10:17:21 +00:00
6 changed files with 32 additions and 32 deletions

View File

@@ -174,13 +174,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<configuration>
<includes>
<include>**/*.html</include>
<include>**/*.png</include>
</includes>
</configuration>
</plugin>
</plugin>
</plugins>
<pluginManagement>
<plugins>