IvanaE 7b90d4b807 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
..
.idea	Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus	2018-10-17 17:53:59 -04:00
app	Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus	2018-10-18 11:36:47 -04:00
gradle/wrapper	fixed some file inconsistencies	2018-10-05 11:40:22 -04:00
.gitignore	Added android project	2018-09-28 15:39:43 -04:00
build.gradle	Fixed UML Diagram	2018-10-14 09:27:59 -04:00
gradle.properties	Added android project	2018-09-28 15:39:43 -04:00
gradlew	Added android project	2018-09-28 15:39:43 -04:00
gradlew.bat	Added android project	2018-09-28 15:39:43 -04:00
settings.gradle	Added android project	2018-09-28 15:39:43 -04:00