IvanaE 4520816740 Merge branch 'lBranch' ... # Conflicts: # OlympusServices/.idea/caches/build_file_checksums.ser # OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java # OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java		2018-11-07 11:39:08 -05:00
..
src	Merge branch 'lBranch'	2018-11-07 11:39:08 -05:00
.gitignore	Added android project	2018-09-28 15:39:43 -04:00
build.gradle	Merge branch 'lBranch'	2018-11-07 11:39:08 -05:00
proguard-rules.pro	Added android project	2018-09-28 15:39:43 -04:00