Roman Volosovskyi 277905124d Merge branch 'develop' into group-chat ... Conflicts: src/status_im/android/core.cljs src/status_im/chat/handlers.cljs src/status_im/group_settings/handlers.cljs src/status_im/group_settings/screen.cljs src/status_im/group_settings/styles/chat_name_edit.cljs src/status_im/group_settings/subs.cljs src/status_im/group_settings/views/chat_name_edit.cljs src/status_im/handlers.cljs src/status_im/navigation.cljs src/status_im/participants/views/contact.cljs src/status_im/participants/views/create.cljs src/status_im/participants/views/remove.cljs src/syng_im/subs.cljs		2016-05-21 16:07:37 +03:00
..
app	Merge branch 'develop' into group-chat	2016-05-21 16:07:37 +03:00
gradle/wrapper	Initial	2016-02-23 01:04:42 +03:00
build.gradle	fix android-geth dependency	2016-04-22 19:04:29 +03:00
gradle.properties	Initial	2016-02-23 01:04:42 +03:00
gradlew	Initial	2016-02-23 01:04:42 +03:00
gradlew.bat	Initial	2016-02-23 01:04:42 +03:00
settings.gradle	Syng to Status	2016-05-19 18:32:38 +02:00