Skip to content

Commit e230b7d

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpKernel] Fix empty request stack when terminating with exception [HttpKernel] Remove EOL when using error_log() in HttpKernel Logger [HttpClient] Add test case for seeking into the content of RetryableHttpClient responses [HttpClient] Fix buffering after calling AsyncContext::passthru() s/annd/and s/gargage/garbage [HttpClient] fix merge [HttpClient] Don't override header if is x-www-form-urlencoded [Console] Fix error output on windows cli Reserve keys when using numeric ones add missing Azerbaijani translations fix few typos/inconsistencies in latvian translations Fix TypeError in Router when using UrlGenerator [Messenger] Fix amqp socket lost fix: use message object from event
2 parents 956da84 + 23c311a commit e230b7d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ChoiceList/ArrayChoiceList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* A list of choices with arbitrary data types.
1616
*
1717
* The user of this class is responsible for assigning string values to the
18-
* choices annd for their uniqueness.
18+
* choices and for their uniqueness.
1919
* Both the choices and their values are passed to the constructor.
2020
* Each choice must have a corresponding value (with the same key) in
2121
* the values array.

Resources/translations/validators.lv.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</trans-unit>
133133
<trans-unit id="128">
134134
<source>Please enter a valid week.</source>
135-
<target>Lūdzu, ievadiet derīgu nedeļu.</target>
135+
<target>Lūdzu, ievadiet derīgu nedēļu.</target>
136136
</trans-unit>
137137
</body>
138138
</file>

0 commit comments

Comments
 (0)