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: dcc607022f4e62e4c544495220c3130c5c30b026

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

..

app

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

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

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

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