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

Skip to content
Commit f9ac4288 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge remote-tracking branch 'origin/open-trashbin-in-files-app' into open-trashbin-in-files-app 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/main/menu/MenuAdapter.java
parents cf8d416d b6c5d93a
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