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

Commit e3c4c1cb authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into 916-settings 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
#	app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
parents a5a84360 c6eed04b
Expand all Show 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