JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
the-social-notebook-android/app/src/main
History
Matan Bar Yosef a3525d06d0 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash screen added and modified
2016-07-03 14:33:02 +03:00
..
java/com/android_app/matan/ara/sagi/thesocialnotework Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 14:33:02 +03:00
res Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 14:33:02 +03:00
AndroidManifest.xml Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 14:33:02 +03:00