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
..
src	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00
.gitignore	Bare Android Project	2016-07-01 14:11:36 +03:00
build.gradle	integrated new note dialog	2016-07-01 18:45:31 +03:00
proguard-rules.pro	Bare Android Project	2016-07-01 14:11:36 +03:00