Matan Bar Yosef d28b96a55c 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_3_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml		2016-07-03 21:55:09 +03:00
..
activity_login.xml	- in progress	2016-07-03 17:38:58 +03:00
activity_personal_space.xml	added location logger & json	2016-07-02 00:28:39 +03:00
activity_splash.xml	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00
note_display_full.xml	added delete option to note display	2016-07-03 17:24:07 +03:00
note_view_full.xml	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00
note_view_mini.xml	added limitation in adding note	2016-07-03 14:32:08 +03:00