summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsmir Mustafic <[email protected]>2019-03-10 12:41:28 +0100
committerAsmir Mustafic <[email protected]>2019-03-10 12:41:28 +0100
commitc961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad (patch)
treea350265a13e638bb56b9e47796e12e11f85037c0
parent92fff5cba7ecbafadba8c7a4ba71d91aab223928 (diff)
prepare 2.6.0
-rw-r--r--RELEASE.md4
-rw-r--r--composer.json2
2 files changed, 5 insertions, 1 deletions
diff --git a/RELEASE.md b/RELEASE.md
index 503536c..3c51cec 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,5 +1,9 @@
# Release Notes
+2.6.0 (2019-03-10)
+
+- #163: Allow to pass a charset to the Scanner
+
2.5.0 (2018-12-27)
- #162, #161, #155, #154, #153, #151: big performance improvements
diff --git a/composer.json b/composer.json
index 25e91d4..a1c059b 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}