Loading
Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
# Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java