From e37b22bf2bdec18f3446fcbd386e15655d833624 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 4 Jun 2021 22:58:10 +0200
Subject: [PATCH] prepare release 18.2.0

---
 .github_changelog_generator |  4 ++--
 CHANGELOG.md                | 15 +++++++++++++++
 README.md                   |  2 +-
 composer.json               |  2 +-
 docs/conf.py                |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github_changelog_generator b/.github_changelog_generator
index 9a4515e9fb..787995f82f 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,8 +1,8 @@
 user=PHPOffice
 project=PHPWord
 
-since-tag=0.17.0
-future-release=0.18.0
+since-tag=0.18.1
+future-release=0.18.2
 
 issues=false
 pulls=true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97f298a73..f9b4ec0af0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.18.2](https://github.com/PHPOffice/PHPWord/tree/0.18.2) (2021-06-04)
+
+[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.18.1...0.18.2)
+
+### Bug fixes
+- when adding image to relationship first check that the generated RID is actually unique [\#2063](https://github.com/PHPOffice/PHPWord/pull/2063) ([tpv-ebben](https://github.com/tpv-ebben))
+- Update chart, don't write 'c:overlap' if grouping is 'clustered' [\#2052](https://github.com/PHPOffice/PHPWord/pull/2052) ([dfsd534](https://github.com/dfsd534))
+- Update Html parser to accept line-height:normal [\#2041](https://github.com/PHPOffice/PHPWord/pull/2041) ([joelgo](https://github.com/joelgo))
+- Fix image border in Word2007 Writer for LibreOffice 7 [\#2021](https://github.com/PHPOffice/PHPWord/pull/2021) ([kamilmmach](https://github.com/kamilmmach))
+
+### Miscellaneous
+- Corrected namespace for Language class in docs. [\#2087](https://github.com/PHPOffice/PHPWord/pull/2087) ([MegaChriz](https://github.com/MegaChriz))
+- Added support for Garamond font [\#2078](https://github.com/PHPOffice/PHPWord/pull/2078) ([artemkolotilkin](https://github.com/artemkolotilkin))
+- Add BorderStyle for Cell Style to documentation [\#2090](https://github.com/PHPOffice/PHPWord/pull/2090) ([DShkrabak](https://github.com/DShkrabak))
+
 ## [0.18.1](https://github.com/PHPOffice/PHPWord/tree/0.18.1) (2021-03-08)
 
 [Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.18.0...0.18.1)
diff --git a/README.md b/README.md
index 30b008a28e..c50ffc6efc 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ You can of course also manually edit your composer.json file
 ```json
 {
     "require": {
-       "phpoffice/phpword": "v0.16.*"
+       "phpoffice/phpword": "v0.18.*"
     }
 }
 ```
diff --git a/composer.json b/composer.json
index 19e7689c68..e588ef7bd1 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.18-dev"
+            "dev-develop": "0.19-dev"
         }
     }
 }
diff --git a/docs/conf.py b/docs/conf.py
index bc1e13402c..ef7b2dcf6c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.18.0'
+version = '0.18.2'
 # The full version, including alpha/beta/rc tags.
 release = version