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

Commit b5744f55 authored by David Luhmer's avatar David Luhmer
Browse files

Merge branch 'master' into packageRenaming 

# Conflicts:
#	src/main/java/com/nextcloud/android/sso/AccountImporter.java
#	src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java
#	src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java
parents 9e6cd4c3 365434d2
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