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

..

carousel

js/window

2016-05-30 08:58:38 +03:00

chat_icon

Fix contacts sorting

2016-06-20 12:50:20 +03:00

drawer

move js/React to cljsjs.react.cljs

2016-05-30 11:01:57 +03:00

icons

clean js/window first attempt

2016-05-30 08:58:38 +03:00

tabs

Improve tabs bar animation

2016-06-17 15:45:02 +03:00

action_button.cljs

clean js/window first attempt

2016-05-30 08:58:38 +03:00

animation.cljs

another attempt

2016-06-20 01:20:48 +03:00

camera.cljs

implemented #119 and #120

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

drag_drop.cljs

Start response suggestions dragging

2016-06-01 16:36:43 +03:00

invertible_scroll_view.cljs

js/window

2016-05-30 08:58:38 +03:00

item_checkbox.cljs

clean js/window first attempt

2016-05-30 08:58:38 +03:00

main_tabs.cljs

Tabs animation

2016-06-09 15:55:43 +03:00

qr-code.cljs

implemented #119 and #120

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

react.cljs

orientation

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

spinner.cljs

syng to status

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

styles.cljs

no contacts screen & some fixes

2016-06-21 18:48:41 +03:00

toolbar.cljs

merged develop

2016-06-10 03:21:48 +03:00