Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8c23f1bb authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch 'v1-oreo' into '660-o-set-Logger-to-info-for-prod' 

# Conflicts:
#   app/src/main/java/foundation/e/drive/EdriveApplication.java
#   app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java
parents 75e407cb e68e06f8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment