From 8c0ce38301738d52a66ec8eaac3e640522262941 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 19 Dec 2019 16:55:24 +0100
Subject: [PATCH] prep 1.0.0-beta.20

---
 CHANGELOG.md             | 8 ++++++++
 Cargo.lock               | 6 +++---
 Cargo.toml               | 2 +-
 deltachat-ffi/Cargo.toml | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e149e3fe..0d763a979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog 
 
+## 1.0.0-beta.20
+
+- #1074 fix OAUTH2/gmail
+- #1072 fix group members not appearing in contact list
+- #1071 never block interrupt_idle (thus hopefully also not on maybe_network())
+- #1069 reduce smtp-timeout to 30 seconds
+- #1066 #1065 avoid unwrap in dehtml, make literals more readable
+
 ## 1.0.0-beta.19
 
 - #1058 timeout smtp-send if it doesn't complete in 15 minutes 
diff --git a/Cargo.lock b/Cargo.lock
index 5445fc2d4..c6967a71c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -658,7 +658,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.20"
 dependencies = [
  "async-imap 0.1.1 (git+https://github.com/async-email/async-imap?branch=dcc-stable)",
  "async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -735,9 +735,9 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.20"
 dependencies = [
- "deltachat 1.0.0-beta.19",
+ "deltachat 1.0.0-beta.20",
  "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 2c46f26f4..8094cb2c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.20"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
index 721cf3788..c386c62a8 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.20"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"