fjc40 a0468f251b Merge remote-tracking branch 'origin/story33-estimateTime' into sp4_s31_cleanups ...

# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved.

2017-05-18 23:41:17 +12:00

..

doc

Actually added sub modules this time

2017-04-20 11:16:19 +12:00

src

Merge remote-tracking branch 'origin/story33-estimateTime' into sp4_s31_cleanups

2017-05-18 23:41:17 +12:00

pom.xml

Removed the rest of the shared model classes needed by mock

2017-05-01 15:49:07 +12:00