Merge branch 'release/2.3.x' into release/2.4.x

# Conflicts:
#	gradle.properties

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModelTest.kt

 package de.rki.coronawarnapp.ui.presencetracing.organizer.create
 
 import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.bugreporting.censors.presencetracing.TraceLocationCensor
 import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
 import de.rki.coronawarnapp.presencetracing.locations.TraceLocationCreator
 import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
@@ -15,6 +16,7 @@ import okio.ByteString.Companion.encode
 import org.joda.time.DateTime
 import org.joda.time.Duration
 import org.joda.time.Instant
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -35,6 +37,11 @@ internal class TraceLocationCreateViewModelTest : BaseTest() {
         MockKAnnotations.init(this)
     }
 
+    @AfterEach
+    fun teardown() {
+        TraceLocationCensor.dataToCensor = null
+    }
+
     @ParameterizedTest
     @MethodSource("provideArguments")
     fun `send should not be enabled for empty form`(category: TraceLocationCategory) {

README.md

@@ -39,7 +39,7 @@ The goal of this project is to develop the official Corona-Warn-App for Germany
 * In General every TODO comment within the code or the documentation can be regarded as an issue. You are free to tackle the TODOs anytime!
 * We are aware of the Play Store Limitations of GMS.
 * Without your own server instance (e.g. a local Docker setup), you will not be able to test the Application. For help, please refer to the [server implementation](https://github.com/corona-warn-app/cwa-server).
-* Strings including translations are handled separately, for suggestions / findings please have a look at issue #332
+* Strings including translations are handled separately, for suggestions / findings please have a look at issue [#332](https://github.com/corona-warn-app/cwa-app-android/issues/332)
 
 ## Architecture & Documentation
 
@@ -107,4 +107,4 @@ You may obtain a copy of the License from [here](./LICENSE).
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the [LICENSE](./LICENSE) for the specific language governing permissions and limitations under the License.
 
-Please see the [detailed licensing information](https://api.reuse.software/info/github.com/corona-warn-app/cwa-app-android) via the [REUSE Tool](https://reuse.software/) for more details.
\ No newline at end of file
+Please see the [detailed licensing information](https://api.reuse.software/info/github.com/corona-warn-app/cwa-app-android) via the [REUSE Tool](https://reuse.software/) for more details.