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

Commit 87f66adb authored by David Luhmer's avatar David Luhmer
Browse files

Merge branch 'sso'

# Conflicts:
#	.gitignore
#	README.md
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/de/luhmer/owncloud/accountimporter/helper/AccountImporter.java
#	src/main/res/values/strings.xml
parents 39fdb225 70831be8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment