Roman Volosovskyi 5abe38445e Merge branch 'develop' into feature/#123 ... Conflicts: android/app/build.gradle android/settings.gradle package.json src/status_im/chat/handlers.cljs src/status_im/chat/subs.cljs Former-commit-id: dd3eb3c0eb		2016-06-23 12:02:39 +03:00
..
assets/fonts	moved re-frame app to root folder	2016-04-04 19:21:10 +03:00
java/com/statusim	Merge branch 'develop' into feature/#123	2016-06-23 12:02:39 +03:00
res	no contacts screen & some fixes	2016-06-21 18:48:41 +03:00
AndroidManifest.xml	Moved geth to service	2016-06-16 07:23:11 +03:00