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
+4 -1
View File
@@ -9,6 +9,9 @@ before_install:
- chmod +x ./.travis/call-creation.sh - chmod +x ./.travis/call-creation.sh
- mvn clean - mvn clean
install:
- sudo apt-get update && sudo apt-get --assume-yes install zip unzip
script: "./.travis/maven-build.sh" script: "./.travis/maven-build.sh"
after_deploy: "./.travis/call-creation.sh" after_deploy: "./.travis/call-creation.sh"
@@ -51,4 +54,4 @@ deploy:
branch: branch:
- master - master
- development - development
jdk: 'oraclejdk7' jdk: 'oraclejdk7'
+3 -3
View File
@@ -15,9 +15,9 @@
<repositories> <repositories>
<repository> <repository>
<id>git-parabot</id> <id>parabot-maven</id>
<name>Parabot's Git based repo</name> <name>Parabot its Maven Repository</name>
<url>https://github.com/parabot/Maven-Repository/raw/master/</url> <url>http://maven.parabot.org/</url>
</repository> </repository>
</repositories> </repositories>