Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 108a6824 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' into 354-password-protection 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
parents 1ed17b2e f08b0018
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment