aranzaiger e341fe119d Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # .idea/gradle.xml # .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_3_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/res/layout/note_view_full.xml # build.gradle		2016-07-01 17:04:06 +03:00
..
java/com/android_app/matan/ara/sagi/thesocialnotework	added personalSpaceActivity and Note	2016-07-01 16:34:32 +03:00
res	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-01 17:04:06 +03:00
AndroidManifest.xml	added personalSpaceActivity and Note	2016-07-01 16:34:32 +03:00