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
..
libs	parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)	2016-06-14 14:19:56 +03:00
src/main	Merge branch 'develop' into feature/#123	2016-06-15 10:47:38 +03:00
BUCK	syng to status	2016-05-19 18:31:56 +02:00
build.gradle	Merge branch 'develop' into feature/#123	2016-06-15 10:47:38 +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