IvanaE 60f9008151 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus ... # Conflicts: # OlympusServices/.idea/caches/build_file_checksums.ser		2018-11-14 14:15:06 -05:00
..
androidTest/java/com/uottawa/olympus/olympusservices	Testing	2018-11-07 13:28:41 -05:00
main	Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus	2018-11-14 14:15:06 -05:00
test/java/com/uottawa/olympus/olympusservices	Finished the test files	2018-11-14 13:59:26 -05:00