Matan Bar Yosef 8f5b43854f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java		2016-07-02 19:36:31 +03:00
..
activity_login.xml	- login api call implemented	2016-07-02 19:27:32 +03:00
activity_personal_space.xml	added location logger & json	2016-07-02 00:28:39 +03:00
note_view_full.xml	- note_view_full modified	2016-07-01 18:10:40 +03:00
note_view_mini.xml	get all notes	2016-07-02 19:03:31 +03:00