diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-12-29 00:22:27 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-12-29 00:22:27 +0300 |
| commit | bb542a887f9b90c3280332469df80542620edbab (patch) | |
| tree | a0b477292aff87a9757b1c0073e658a1bab7e007 /app/src/main/java/it/niedermann/owncloud/notes/persistence/migration | |
| parent | 7486d48fce91ae66aca51d61abd9d7d78989f8cf (diff) | |
| parent | 852f205e3480b6b3c87275e4c008da4641bc5ca8 (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/persistence/migration')
0 files changed, 0 insertions, 0 deletions