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

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

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

# Conflicts:
#	.gitlab-ci.yml
#	build.gradle
#	src/androidTest/java/foundation/e/vcard4android/AndroidAddressBookTest.kt
#	src/androidTest/java/foundation/e/vcard4android/AndroidContactTest.kt
#	src/androidTest/java/foundation/e/vcard4android/AndroidGroupTest.kt
parents e1cbe8dd f2db5fb1
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