Roman Volosovskyi dd3eb3c0eb 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
2016-06-23 12:02:39 +03:00
..
2016-02-23 01:04:42 +03:00
2016-04-22 19:04:29 +03:00
2016-02-23 01:04:42 +03:00
2016-02-23 01:04:42 +03:00
2016-02-23 01:04:42 +03:00