Merge branch 'development' of github.com:Parabot/Randoms into bugfix/dreamscape-accessibly

# Conflicts:
#	pom.xml
This commit is contained in:
JKetelaar
2016-11-01 01:34:30 +01:00
2 changed files with 7 additions and 4 deletions
+3 -3
View File
@@ -15,9 +15,9 @@
<repositories>
<repository>
<id>git-parabot</id>
<name>Parabot's Git based repo</name>
<url>https://github.com/parabot/Maven-Repository/raw/master/</url>
<id>parabot-maven</id>
<name>Parabot its Maven Repository</name>
<url>http://maven.parabot.org/</url>
</repository>
</repositories>