IvanaE 173f6097fd Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus ... # Conflicts: # OlympusServices/app/src/main/res/layout/activity_log_in.xml		2018-10-18 11:36:47 -04:00
..
src	Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus	2018-10-18 11:36:47 -04:00
.gitignore	Added android project	2018-09-28 15:39:43 -04:00
build.gradle	Running unit tests with Robolectric instead of starting up emulator every time	2018-10-08 16:25:15 -04:00
proguard-rules.pro	Added android project	2018-09-28 15:39:43 -04:00