batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
SEG2105-Olympus-Android-App.../OlympusServices
History
IvanaE 6e01dd42a3 Merge branch 'lBranch' 
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/.idea/vcs.xml
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
#	OlympusServices/app/src/main/res/layout/activity_main.xml
#	OlympusServices/app/src/main/res/layout/activity_sign_up.xml
#	OlympusServices/build.gradle
2018-10-19 19:02:28 -04:00
..
.idea Merge branch 'lBranch' 2018-10-19 19:02:28 -04:00
app Merge branch 'lBranch' 2018-10-19 19:02:28 -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 Logic 2018-10-19 16:45:18 -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