Roman Volosovskyi f1005daeed Merge branch 'develop' into feature/#123 ...

First attempt.
 Conflicts:
	.re-natal
	android/app/build.gradle
	android/settings.gradle
	src/status_im/chat/handlers.cljs
	src/status_im/chat/views/command.cljs
	src/status_im/chat/views/content_suggestions.cljs
	src/status_im/chat/views/message.cljs
	src/status_im/chat/views/plain_input.cljs


Former-commit-id: 474729f230346fc10d7d14474282f7f6458f0998

2016-06-15 10:47:38 +03:00

..

app

Merge branch 'develop' into feature/#123

2016-06-15 10:47:38 +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-15 10:47:38 +03:00