Merge remote-tracking branch 'origin/change_package_name'
# 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
Loading
Please register or sign in to comment