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
..
profiles_settings.xml	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00
Project_Default.xml	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-03 15:55:10 +03:00