merged master

This commit is contained in:
Joseph Gardner
2017-05-15 16:28:01 +12:00
parent 5d34b49316
commit 93347fd7ef
+3 -3
View File
@@ -68,9 +68,9 @@
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
<id>bintray-hansolo-Medusa</id> <id>eu.hansolo</id>
<name>bintray</name> <name>Medusa</name>
<url>http://dl.bintray.com/hansolo/Medusa</url> <url>https://dl.bintray.com/hansolo/Medusa</url>
</repository> </repository>
<repository> <repository>
<id>maven2-repository.dev.java.net</id> <id>maven2-repository.dev.java.net</id>