Kusal Ekanayake 9112183ac3 Merge branch 'develop' into Story1274_custom_boat_stats ...

# Conflicts:
#	src/main/java/seng302/model/ServerYacht.java
#	src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java

2017-09-23 14:48:50 +12:00

..

main

Merge branch 'develop' into Story1274_custom_boat_stats

2017-09-23 14:48:50 +12:00

test/java

Changed the boatType attribute from all around the place from String lit to enum

2017-09-22 21:00:28 +12:00