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

Skip to content
Commit 72fb3956 authored by David Luhmer's avatar David Luhmer
Browse files

Merge branch 'master' into unit-testing 

# Conflicts:
#	build.gradle
#	src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java
parents 42e8ac5f 4ea9ab33
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