virvar dcc607022f 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

2016-05-24 11:08:54 +03:00

..

src/main

Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.

2016-05-24 11:08:54 +03:00

BUCK

syng to status

2016-05-19 18:31:56 +02:00

build.gradle

Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.

2016-05-24 11:08:54 +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