the-social-notebook-android/app/src
Matan Bar Yosef 145fc0d76f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash JPG added
2016-07-03 15:55:10 +03:00
..
androidTest/java/com/android_app/matan/ara/sagi/thesocialnotework Bare Android Project 2016-07-01 14:11:36 +03:00
main Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 15:55:10 +03:00
test/java/com/android_app/matan/ara/sagi/thesocialnotework Bare Android Project 2016-07-01 14:11:36 +03:00