Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2016-01-12 10:19:36 +00:00
6 changed files with 32 additions and 32 deletions
@@ -6,9 +6,9 @@
<artifactId>executable-war</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>