Roman Volosovskyi 8e2c207b2e 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

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

..

src/main

Merge branch 'develop' into chat-animation

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

BUCK

syng to status

2016-05-19 18:31:56 +02:00

build.gradle

orientation

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

proguard-rules.pro

Initial

2016-02-23 01:04:42 +03:00

react.gradle

moved re-frame app to root folder

2016-04-04 19:21:10 +03:00