Merge pull request #38 from odolbeau/prepare-v311

Prepare v3.1.1
odolbeau · Jun 19, 2020 · 7f9530b · 7f9530b
2 parents 9e5d632 + 5801f89
commit 7f9530b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Changelog
 Unreleased
 ----------
 
+3.1.1
+-----
+
+* Use replace keyword instead of conflict in composer.json
+
 3.1.0
 -----