Merge remote-tracking branch 'origin/master'

This commit is contained in:
ljacqu 2016-09-04 14:49:21 +02:00
commit 4df4e823ec

View File

@ -46,7 +46,7 @@
<properties> <properties>
<!-- Project properties --> <!-- Project properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.jdkVersion>1.7</project.jdkVersion> <project.jdkVersion>1.8</project.jdkVersion>
<!-- Output properties --> <!-- Output properties -->
<project.outputName>AuthMe</project.outputName> <project.outputName>AuthMe</project.outputName>