JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
the-social-notebook-android/app/src/main
History
Aran Zaiger 555805b320 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
2016-07-10 15:24:54 +03:00
..
java/com/android_app/matan/ara/sagi/thesocialnotework Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 15:24:54 +03:00
res Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 15:23:54 +03:00
AndroidManifest.xml Settings and photo upload 2016-07-09 03:12:49 +03:00