This repository was archived by the owner on Jun 7, 2020. It is now read-only.
[BLOCKED][NEW] Add option in settings to download one's data#2305
Open
ubarsaiyan wants to merge 3 commits intoRocketChat:developfrom
Open
[BLOCKED][NEW] Add option in settings to download one's data#2305ubarsaiyan wants to merge 3 commits intoRocketChat:developfrom
ubarsaiyan wants to merge 3 commits intoRocketChat:developfrom
Conversation
hfeky
suggested changes
May 8, 2019
hfeky
reviewed
May 8, 2019
Contributor
|
@ubarsaiyan Could you please fix the conflicts here? |
Contributor
Author
@filipedelimabrito I'm not sure I understand which conflicts you are referring to... The branch is up to date. If you are referring to failed CircleCI tests then maybe it's because of concurrent server and SDK PRs needed for this PR (The branch name is same for all though). The error in the circle CI log is: |
philipbrito
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@RocketChat/android
Closes #1847
Test along with RocketChat/Rocket.Chat.Kotlin.SDK#247 and RocketChat/Rocket.Chat#14428