Backport of #2775: avatar generation does not need storageManager#2787
Merged
AndyScherzinger merged 1 commit intostable-3.2.xfrom Jul 4, 2018
Merged
Backport of #2775: avatar generation does not need storageManager#2787AndyScherzinger merged 1 commit intostable-3.2.xfrom
AndyScherzinger merged 1 commit intostable-3.2.xfrom
Conversation
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me> # Conflicts: # src/main/java/com/owncloud/android/utils/DisplayUtils.java
Member
Author
|
DisplayUtils had a conflict when applying cherry-pick, and now it shows the entire file as diff. |
24 tasks
Member
|
👍 looks good to me, my guess is that something happened with line-breaks (win/unix?) |
Codecov Report
@@ Coverage Diff @@
## stable-3.2.x #2787 +/- ##
===============================================
- Coverage 6.51% 6.51% -0.01%
===============================================
Files 285 285
Lines 28972 28964 -8
Branches 4222 4221 -1
===============================================
- Hits 1888 1886 -2
+ Misses 26800 26793 -7
- Partials 284 285 +1
|
Member
Author
|
Indeed, on branch it is crlf (win), and it is changing to (lf) linux, so everything fine. |
Contributor
|
👍 |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport of #2775
Signed-off-by: tobiasKaminsky tobias@kaminsky.me