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

Skip to content
Commit 7d1de666 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' into weblogin 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
#	app/src/main/res/values/strings.xml
parents 71bdf782 3d86ba1b
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