Merge branch '1.2'

* 1.2: Bump to v1.1.31 Conflicts: CHANGELOG.md
tchwork · Dec 15, 2015 · 3bd61bc · 3bd61bc
2 parents 3516276 + f986d18
commit 3bd61bc
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 - a few fixes in iconv and mbstring shims
 - cleanup refacto for preparing v2 based on symfony-polyfill
 
+## v1.2.6 (2015-12-15)
+
+- fix compat with symfony-polyfill
+
 ## v1.2.5 (2015-10-14)
 
 - handle the third argument of mb_convert_encoding() being an array
@@ -49,6 +53,14 @@
 - add best-fit mappings for UTF-8 to Code Page approximations
 - add portable Unicode filesystem access under Windows and other OSes
 
+## v1.1.31 (2015-12-15)
+
+- fix compat with symfony-polyfill
+
+## v1.1.30 (2015-06-29)
+
+- fix mb_strrpos shim with negative offset
+
 ## v1.1.29 (2015-04-26)
 
 - fix ucwords to be functionally the same as in-built PHP version