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
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
# Conflicts: # app/src/main/java/foundation/e/drive/EdriveApplication.java # app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java