the-social-notebook-android/app
Aran Zaiger f7eb10433f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
2016-07-08 00:16:34 +03:00
..
src Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-08 00:16:34 +03:00
.gitignore Bare Android Project 2016-07-01 14:11:36 +03:00
build.gradle Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-06 20:30:57 +03:00
proguard-rules.pro Bare Android Project 2016-07-01 14:11:36 +03:00