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

Skip to content
Commit 3733ada1 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' into search-in-note 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
parents 065f7328 8d7d284c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment