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: dd3eb3c0eb		2016-06-23 12:02:39 +03:00
..
src/main	Merge branch 'develop' into feature/#123	2016-06-23 12:02:39 +03:00
BUCK	syng to status	2016-05-19 18:31:56 +02:00
build.gradle	Merge branch 'develop' into feature/#123	2016-06-23 12:02:39 +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