Mary Tran 7f169fe0e6 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch		2018-11-28 22:28:05 -05:00
..
java/com/uottawa/olympus/olympusservices	Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch	2018-11-28 22:28:05 -05:00
res	latest code	2018-11-28 22:12:08 -05:00
AndroidManifest.xml	combined booking classes	2018-11-23 14:51:40 -05:00
ic_launcher-web.png	added logo	2018-10-18 12:32:21 -04:00