virvar 5f8f390bd1 Merge remote-tracking branch 'origin/develop' into response-design ...

# Conflicts:
#	src/status_im/db.cljs


Former-commit-id: 86dc0ad06e

2016-06-13 19:54:39 +03:00

..

app

Merge remote-tracking branch 'origin/develop' into response-design

2016-06-13 19:54: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

implemented #119 and #120

2016-06-01 11:41:50 +03:00