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

Skip to content
Commit 458f6104 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/database/DbHelper.java
#   app/src/main/java/foundation/e/drive/database/SyncedFileStateDAO.java
parents 475839c5 bd3ba52e