From 79bce951c7b1260233452d122fa1c51f6e4a8eaf Mon Sep 17 00:00:00 2001
From: Alfonso Grillo <alfogrillo@gmail.com>
Date: Wed, 20 Sep 2023 16:30:28 +0200
Subject: [PATCH] Version 2.13.0

---
 CHANGELOG.md                            | 8 ++++++++
 Cargo.lock                              | 6 +++---
 bindings/wysiwyg-ffi/Cargo.toml         | 2 +-
 bindings/wysiwyg-wasm/Cargo.toml        | 2 +-
 bindings/wysiwyg-wasm/package-lock.json | 4 ++--
 bindings/wysiwyg-wasm/package.json      | 2 +-
 crates/wysiwyg/Cargo.toml               | 2 +-
 platforms/android/gradle.properties     | 2 +-
 platforms/web/package.json              | 2 +-
 9 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f3bfc644..ace1e45ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+# [2.13.0] - 2023-09-20
+
+### Added
+- Android: allow font size customisation in compose (#819)
+
+### Fixed
+- Fix unwanted extra paragraphs after HTML parsing (#820)
+
 # [2.12.0] - 2023-09-18
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index afc9d88fe..9c242915b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1413,7 +1413,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi-wysiwyg-composer"
-version = "2.12.0"
+version = "2.13.0"
 dependencies = [
  "uniffi",
  "uniffi_build",
@@ -1851,7 +1851,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg"
-version = "2.12.0"
+version = "2.13.0"
 dependencies = [
  "cfg-if",
  "email_address",
@@ -1875,7 +1875,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg-wasm"
-version = "2.12.0"
+version = "2.13.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
index 299dbdae8..254c879a3 100644
--- a/bindings/wysiwyg-ffi/Cargo.toml
+++ b/bindings/wysiwyg-ffi/Cargo.toml
@@ -7,7 +7,7 @@ description = "Swift and Kotlin bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "uniffi-wysiwyg-composer"
-version = "2.12.0"
+version = "2.13.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
index e3be99a68..538a9ab0a 100644
--- a/bindings/wysiwyg-wasm/Cargo.toml
+++ b/bindings/wysiwyg-wasm/Cargo.toml
@@ -7,7 +7,7 @@ description = "WASM bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg-wasm"
-version = "2.12.0"
+version = "2.13.0"
 rust-version = { workspace = true }
 
 [package.metadata.wasm-pack.profile.profiling]
diff --git a/bindings/wysiwyg-wasm/package-lock.json b/bindings/wysiwyg-wasm/package-lock.json
index 10095330c..4940ec75c 100644
--- a/bindings/wysiwyg-wasm/package-lock.json
+++ b/bindings/wysiwyg-wasm/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wysiwyg-wasm",
-      "version": "2.12.0",
+      "version": "2.13.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "jest": "^28.1.0",
diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json
index a518623e1..4696a6d2f 100644
--- a/bindings/wysiwyg-wasm/package.json
+++ b/bindings/wysiwyg-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
   "license": "Apache-2.0",
diff --git a/crates/wysiwyg/Cargo.toml b/crates/wysiwyg/Cargo.toml
index 16b4bb831..dc16f4b2e 100644
--- a/crates/wysiwyg/Cargo.toml
+++ b/crates/wysiwyg/Cargo.toml
@@ -7,7 +7,7 @@ description = "Model code to power a rich text editor for Matrix"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg"
-version = "2.12.0"
+version = "2.13.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
index d9234fedf..b638e3fd1 100644
--- a/platforms/android/gradle.properties
+++ b/platforms/android/gradle.properties
@@ -27,7 +27,7 @@ RELEASE_SIGNING_ENABLED=true
 
 GROUP=io.element.android
 # POM_ARTIFACT_ID is configured in each module's gradle.properties
-VERSION_NAME=2.12.0
+VERSION_NAME=2.13.0
 
 POM_NAME=Matrix WYSIWYG
 POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.
diff --git a/platforms/web/package.json b/platforms/web/package.json
index 01053676e..01d9ed55e 100644
--- a/platforms/web/package.json
+++ b/platforms/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-wysiwyg",
-    "version": "2.12.0",
+    "version": "2.13.0",
     "type": "module",
     "description": "Wysiwyg composer for matrix.org using React",
     "author": "matrix.org",