Aran Zaiger 15fce6daa2 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 01:05:52 +03:00
..
ara/sagi/thesocialnotework	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-04 01:05:52 +03:00