Roman Volosovskyi 63034358b2 Merge branch 'develop' into chat-animation ...

Conflicts:
	.re-natal
	src/status_im/android/core.cljs
	src/status_im/chat/views/message_input.cljs
	src/status_im/chat/views/plain_message.cljs
	src/status_im/db.cljs


Former-commit-id: 8e2c207b2eca5c9dccfc9fce70e1ccaa4448d260

2016-06-21 19:17:30 +03:00

..

app

Merge branch 'develop' into chat-animation

2016-06-21 19:17:30 +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

orientation

2016-06-21 12:03:39 +03:00