Roman Volosovskyi 5abe38445e Merge branch 'develop' into feature/#123 ...

Conflicts:
	android/app/build.gradle
	android/settings.gradle
	package.json
	src/status_im/chat/handlers.cljs
	src/status_im/chat/subs.cljs


Former-commit-id: dd3eb3c0eb13b1bc2e587e1164d0882b0fb4a480

2016-06-23 12:02:39 +03:00

..

handlers

edit mode

2016-06-21 12:46:02 +03:00

styles

Merge branch 'develop' into feature/#123

2016-06-23 12:02:39 +03:00

views

Merge branch 'develop' into feature/#123

2016-06-23 12:02:39 +03:00

handlers.cljs

Merge branch 'develop' into feature/#123

2016-06-23 12:02:39 +03:00

screen.cljs

edit mode

2016-06-21 12:46:02 +03:00

sign_up.cljs

parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)

2016-06-14 14:19:56 +03:00

subs.cljs

Merge branch 'develop' into feature/#123

2016-06-23 12:02:39 +03:00

suggestions.cljs

parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)

2016-06-14 14:19:56 +03:00