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

Commit 565915d0 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into ScottieKim-fix/subcategoryux 

# Conflicts:
#	app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java
parents 5c124bc9 68b83a39
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