+3
−3
+1
−1
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
# Conflicts: # app/src/main/java/foundation/e/notes/android/fragment/PreferencesFragment.java # app/src/main/java/foundation/e/notes/persistence/NoteServerSyncHelper.java # app/src/main/java/foundation/e/notes/util/NotesClient.java # app/src/main/java/foundation/e/notes/util/NotesClientUtil.java # app/src/main/java/foundation/e/notes/util/SupportUtil.java