Merge branch 'master' into story70

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java
2017-09-10 15:19:03 +12:00
parent 65b960f725 14aaf26b73
commit 28ec4b9246
94 changed files with 3804 additions and 880 deletions
@@ -106,6 +106,9 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-project-info-reports-plugin</artifactId>
                <version>2.8.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
            </plugin>
        </plugins>
    </reporting>