 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 |
|
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c
|
2016-05-20 22:12:08 +03:00 |
|
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
|
2016-05-20 14:20:48 +03:00 |
|
|
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e
|
2016-05-19 18:32:38 +02:00 |
|
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247c
|
2016-05-19 18:31:56 +02:00 |
|