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
..
app	Merge branch 'develop' into feature/#123	2016-06-23 12:02:39 +03:00
gradle/wrapper	Initial	2016-02-23 01:04:42 +03:00
build.gradle	fix android-geth dependency	2016-04-22 19:04:29 +03:00
gradle.properties	Initial	2016-02-23 01:04:42 +03:00
gradlew	Initial	2016-02-23 01:04:42 +03:00
gradlew.bat	Initial	2016-02-23 01:04:42 +03:00
settings.gradle	Merge branch 'develop' into feature/#123	2016-06-23 12:02:39 +03:00