Commit graph

3 commits

Author SHA1 Message Date
Aran Zaiger 2ff762fced Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
#	app/src/main/res/layout/fragment_personal.xml
2016-07-09 21:29:37 +03:00
Matan Bar Yosef 8c4b5fbd9b - note display full modified
- added avatar image class and implemented on map on note display (personal and map views)
2016-07-09 01:50:49 +03:00
Aran Zaiger 4f544308fb added skeleton for map 2016-07-04 01:01:20 +03:00