status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
status-mobile/android/app
History
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
..
src/main Merge branch 'develop' into group-chat 2016-05-21 16:07:37 +03:00
BUCK syng to status 2016-05-19 18:31:56 +02:00
build.gradle syng to status 2016-05-19 18:31:56 +02: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