2 commits

Author	SHA1	Message	Date
Matan Bar Yosef	688602529a	- filters added on map and personal space ... - note view mini modified	2016-07-09 18:20:13 +03:00
Aran Zaiger	2ca5d59ee2	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-06 20:30:57 +03:00