Browse code
Merge branch '1.x' into 2.x
* 1.x:
bumped version to 1.36.1-DEV
prepared the 1.36.0 release
Fabien Potencier authored on 16/12/2018 10:35:40
Showing 1 changed files
| ... | ... |
@@ -125,7 +125,11 @@ |
| 125 | 125 |
* improved the performance of the filesystem loader |
| 126 | 126 |
* removed features that were deprecated in 1.x |
| 127 | 127 |
|
| 128 |
-* 1.36.0 (2018-XX-XX) |
|
| 128 |
+* 1.36.1 (2018-XX-XX) |
|
| 129 |
+ |
|
| 130 |
+ * n/a |
|
| 131 |
+ |
|
| 132 |
+* 1.36.0 (2018-12-16) |
|
| 129 | 133 |
|
| 130 | 134 |
* made sure twig_include returns a string |
| 131 | 135 |
* fixed multi-byte UFT-8 in escape('html_attr')
|