Browse code

Merge branch '1.x' into 2.x

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

Fabien Potencier authored on 11/02/2020 07:49:24
Showing 2 changed files
... ...
@@ -39,7 +39,7 @@ jobs:
39 39
         - php: 7.1
40 40
         - php: 7.2
41 41
         - php: 7.3
42
-        - php: 7.4snapshot
42
+        - php: 7.4
43 43
         - stage: integration tests
44 44
           php: 7.3
45 45
           script: ./drupal_test.sh
... ...
@@ -300,7 +300,11 @@
300 300
  * improved the performance of the filesystem loader
301 301
  * removed features that were deprecated in 1.x
302 302
 
303
-* 1.42.5 (2020-XX-XX)
303
+* 1.42.6 (2020-XX-XX)
304
+
305
+ * n/a
306
+
307
+* 1.42.5 (2020-02-11)
304 308
 
305 309
  * Fix implementation of case-insensitivity for method names
306 310