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

Skip to content
Commit c4acea25 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/stefan-niedermann/master'

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
#	app/src/main/res/values-b+en+001/strings.xml
#	cert4android
parents 22c532d0 93fdb504
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment