Aran Zaiger b339b72687 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:23 +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:23 +03:00
res	Movin fragment container to the proper place	2016-07-10 15:16:11 +03:00
AndroidManifest.xml	Settings and photo upload	2016-07-09 03:12:49 +03:00