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

Skip to content
Commit 968e9637 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java
parents 3cd27566 27817926
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