IvanaE b8ea57317e 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
..
java/com/uottawa/olympus/olympusservices	Merge branch 'lBranch'	2018-11-07 11:39:08 -05:00
res	fixed table alignment	2018-11-02 18:14:32 -04:00
AndroidManifest.xml	added popups and services	2018-10-28 19:31:34 -04:00
ic_launcher-web.png	added logo	2018-10-18 12:32:21 -04:00