diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-02-11 14:00:26 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-02-11 14:08:53 +0300 |
| commit | 0c01f258c25d6fa2b162730324ea0e3a821c8fd6 (patch) | |
| tree | 987ef5826ee393ead604d6e88d2896b6c1fb8c5f /app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote | |
| parent | a0112185804066d054f555ecc8fcf9ab61f39ca5 (diff) | |
| parent | 4a0c16fdada3b3f84937be57f1ce355f1cfb9a0e (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote')
0 files changed, 0 insertions, 0 deletions