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

Skip to content
Commit c2654de4 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/bitfireAT/master'

# Conflicts:
#	.gitlab-ci.yml
#	build.gradle
#	src/main/java/at/bitfire/dav4android/DavAddressBook.kt
#	src/main/java/at/bitfire/dav4android/DavCalendar.kt
#	src/main/java/at/bitfire/dav4android/DavCollection.kt
#	src/main/java/at/bitfire/dav4android/DavResource.kt
#	src/test/java/at/bitfire/dav4android/exception/HttpExceptionTest.kt
parents b6096a32 8010a09e
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