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

Skip to content
Commit aa56217c 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/ical4android/AndroidCalendarTest.kt
#	src/androidTest/java/foundation/e/ical4android/AndroidEventTest.kt
#	src/androidTest/java/foundation/e/ical4android/AndroidTaskListTest.kt
#	src/androidTest/java/foundation/e/ical4android/AndroidTaskTest.kt
#	src/main/java/at/bitfire/ical4android/EventColor.kt
#	src/main/java/foundation/e/ical4android/Css3Color.kt
#	src/main/java/foundation/e/ical4android/EventColor.kt
#	src/main/java/foundation/e/ical4android/ICalendar.kt
#	src/test/java/at/bitfire/ical4android/EventColorTest.kt
#	src/test/java/foundation/e/ical4android/Css3ColorTest.kt
#	src/test/java/foundation/e/ical4android/EventColorTest.kt
parents 2df1d4ad 13e85f0b
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