the-social-notebook-android/app/src/main
Aran Zaiger b9e37f88b0 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:26 +03:00
..
java/com/android_app/matan/ara/sagi/thesocialnotework Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-09 21:29:26 +03:00
res added filters to personal space 2016-07-09 21:23:55 +03:00
AndroidManifest.xml Settings and photo upload 2016-07-09 03:12:49 +03:00