Browse code

Merge branch '2.x' into 3.x

* 2.x:
Fix 7.4 on Travis
Fix version
Bump version to 2.12.5-DEV
Prepare the 2.12.4 release
Bump version to 1.42.6-DEV
Prepare the 1.42.5 release

Fabien Potencier authored on 11/02/2020 07:50:06
Showing 2 changed files
... ...
@@ -36,7 +36,7 @@ jobs:
36 36
     include:
37 37
         - php: 7.2
38 38
         - php: 7.3
39
-        - php: 7.4snapshot
39
+        - php: 7.4
40 40
         # Drupal does not support 3.x yet
41 41
         #- stage: integration tests
42 42
         #  php: 7.3
... ...
@@ -34,7 +34,11 @@
34 34
  * bumped minimum PHP version to 7.2
35 35
  * removed PSR-0 classes
36 36
 
37
-* 2.12.4 (2020-XX-XX)
37
+* 2.12.5 (2020-XX-XX)
38
+
39
+ * n/a
40
+
41
+* 2.12.4 (2020-02-11)
38 42
 
39 43
  * Avoid exceptions when an intl resource is not found
40 44
  * Fix implementation of case-insensitivity for method names
... ...
@@ -332,7 +336,11 @@
332 336
  * improved the performance of the filesystem loader
333 337
  * removed features that were deprecated in 1.x
334 338
 
335
-* 1.42.5 (2020-XX-XX)
339
+* 1.42.6 (2020-XX-XX)
340
+
341
+ * n/a
342
+
343
+* 1.42.5 (2020-02-11)
336 344
 
337 345
  * Fix implementation of case-insensitivity for method names
338 346