virvar 2423dfad15 Merge remote-tracking branch 'origin/develop' into response-design ...

# Conflicts:
#	src/status_im/chat/screen.cljs
#	src/status_im/chat/views/command.cljs
#	src/status_im/chat/views/plain_input.cljs
#	src/status_im/group_settings/screen.cljs
#	src/status_im/models/commands.cljs
#	src/status_im/new_group/screen.cljs


Former-commit-id: 217f0f93d8198087accf93bd51b119152ac7e68a

2016-06-03 16:19:59 +03:00

..

chats.cljs

syng to status

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

commands.cljs

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

2016-06-03 16:19:59 +03:00

contacts.cljs

syng to status

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

messages.cljs

Merge branch 'develop' into group-chat

2016-05-21 16:07:37 +03:00

protocol.cljs

syng to status

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