Aran Zaiger 867dc7d877 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java		2016-07-08 03:20:03 +03:00
..
java/com/android_app/matan/ara/sagi/thesocialnotework	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 03:20:03 +03:00
res	Started to tweak note_display_full.xml	2016-07-08 02:15:06 +03:00
AndroidManifest.xml	Merged Arans Map Code to Master	2016-07-06 22:14:41 +03:00