Skip to content
Snippets Groups Projects
Select Git revision
  • master default
1 result
Compare
Forked from introduction-dh / CodingForHumanities1
Source project has a limited visibility.
user avatar
Merge branch 'release/2.0.x' into chore/merge-2.0.x-into-2.1.x
Matthias Urhahn authored 
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabase.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/migration/PresenceTracingDatabaseMigration1To2.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/EventRegistrationUIModule.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/PastCheckInVH.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/task/SubmissionTaskTest.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/testavailable/SubmissionTestResultAvailableViewModelTest.kt
#	gradle.properties
d2a948a3
History
user avatar d2a948a3
History
Name Last commit Last update