Skip to content
This repository has been archived by the owner on Feb 17, 2023. It is now read-only.

V4.0 wire #1036

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open

V4.0 wire #1036

wants to merge 88 commits into from

Conversation

riskAdi
Copy link

@riskAdi riskAdi commented Apr 20, 2017

No description provided.

ex3ndr added 30 commits July 11, 2016 23:37
# Conflicts:
#	actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/messages/MessagesFragment.java
…ation in EncryptedUserActor, fallback of processing of encrypted updates
ex3ndr and others added 30 commits July 30, 2016 01:05
# Conflicts:
#	actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/ChatActivity.java
#	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/Modules.java
#	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/messaging/router/RouterActor.java
#	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsModule.java
#	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsProcessor.java
#	actor-sdk/sdk-core/core/core-shared/src/main/java/im/actor/core/modules/settings/SettingsSyncActor.java
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants