virvar 49a9ae3ba1 Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization. ... # Conflicts: # .re-natal # android/app/build.gradle # android/app/src/main/java/com/statusim/MainActivity.java # android/settings.gradle # src/status_im/chat/handlers.cljs # src/status_im/chat/screen.cljs # src/status_im/chats_list/views/chat_list_item.cljs # src/status_im/db.cljs # src/status_im/group_settings/screen.cljs Former-commit-id: dcc607022f		2016-05-24 11:08:54 +03:00
..
assets/fonts	moved re-frame app to root folder	2016-04-04 19:21:10 +03:00
java/com/statusim	Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.	2016-05-24 11:08:54 +03:00
res	Merge pull request #92 from status-im/group-chat	2016-05-23 15:28:49 +02:00
AndroidManifest.xml	Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.	2016-05-24 11:08:54 +03:00