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

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

Merge branch '144-o-refactor-ObserverService' into '144-o-extract-localFileDiff-code' 

# Conflicts:
#   app/src/main/java/foundation/e/drive/services/ObserverService.java
#   app/src/main/java/foundation/e/drive/utils/FileDiffUtils.java
parents dab7414f 121952d2
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