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: 474729f230		2016-06-15 10:47:38 +03:00
..
commands.js	Merge branch 'develop' into feature/#123	2016-06-15 10:47:38 +03:00
status.js	staged command preview	2016-06-14 17:36:39 +03:00