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 |
Adrian Tiberius
|
4a35a06b8c
|
merged develop
|
2016-05-20 22:12:08 +03:00 |
|
virvar
|
ff5898b0a1
|
Merge 'develop' into 'real-data'
|
2016-05-20 14:20:48 +03:00 |
|
Adrian Tiberius
|
799808965d
|
add gradient
|
2016-05-19 20:05:04 +03:00 |
Jarrad
|
134c040c3e
|
Syng to Status
|
2016-05-19 18:32:38 +02:00 |
|
virvar
|
1f5dad71e8
|
Setup sms-listener
|
2016-05-18 17:40:26 +03:00 |
michaelr
|
5a3b923b0c
|
moved re-frame app to root folder
|
2016-04-04 19:21:10 +03:00 |
|
virvar
|
1a7d089ddc
|
Save whisper identities to db
|
2016-03-11 19:04:12 +03:00 |
Jarrad Hope
|
f4af8beb15
|
i18n android integration, TODO iOS
|
2016-02-23 23:15:51 +01:00 |
|
virvar
|
7c6e7c644a
|
Initial
|
2016-02-23 01:04:42 +03:00 |