diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-04-20 09:32:18 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-04-20 09:32:39 +0300 |
| commit | e8e350e99cb322ad0dc3da2eb9493ae7ed21e2a7 (patch) | |
| tree | be768b055b660da1f12b6433e6beb51b1af7e045 /app/src/main/java/it/niedermann/owncloud/notes/shared | |
| parent | 20b4163ea014968f5daa95117b4217f2e286580d (diff) | |
| parent | 1cb9573c8d16bcac3e21e551bad9c6f9d3d3ebd9 (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/shared')
0 files changed, 0 insertions, 0 deletions