3 commits

Author	SHA1	Message	Date
Aran Zaiger	867dc7d877	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java	2016-07-08 03:20:03 +03:00
Sagi Dayan	1caf758344	Merged Arans Map Code to Master	2016-07-06 22:14:41 +03:00
Aran Zaiger	d57f338207	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_4_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml	2016-07-04 23:11:10 +03:00