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

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

Merge branch 'master' into 395-e2e-test 

# Conflicts:
#	sample/src/main/java/com/nextcloud/android/sso/sample/MainActivity.java
parents 79f2008b f163b632
Hide 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