IvanaE 6f88a7bc71 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
..
codeStyles	Added android project	2018-09-28 15:39:43 -04:00
assetWizardSettings.xml	trying some wild stuff	2018-11-01 12:49:40 -04:00
gradle.xml	Added android project	2018-09-28 15:39:43 -04:00
misc.xml	Fixed UML	2018-11-13 16:07:24 -05:00
runConfigurations.xml	Added android project	2018-09-28 15:39:43 -04:00
vcs.xml	Logic	2018-10-19 16:45:18 -04:00