2 Commits

Author SHA1 Message Date
Roman Volosovskyi
b746bcef4f attempt to fix performance issues
Former-commit-id: 3a93e0890bfea4b167b934c26f2c5096ea73421a
2016-06-30 17:23:38 +03:00
Roman Volosovskyi
7d2371afec Merge branch 'develop' into group-chat
Conflicts:
	src/status_im/android/core.cljs
	src/status_im/chat/handlers.cljs
	src/status_im/group_settings/handlers.cljs
	src/status_im/group_settings/screen.cljs
	src/status_im/group_settings/styles/chat_name_edit.cljs
	src/status_im/group_settings/subs.cljs
	src/status_im/group_settings/views/chat_name_edit.cljs
	src/status_im/handlers.cljs
	src/status_im/navigation.cljs
	src/status_im/participants/views/contact.cljs
	src/status_im/participants/views/create.cljs
	src/status_im/participants/views/remove.cljs
	src/syng_im/subs.cljs


Former-commit-id: 277905124dc9fe2bd4ea6362dd1365dca567ae38
2016-05-21 16:07:37 +03:00