From 801162d7bed7302431306cf7fb49fb13071d12e6 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 16 Dec 2019 13:20:14 +0100
Subject: [PATCH] prepare to tag 1.0.0-beta.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887a7fe4b..10db49329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog 
 
+## 1.0.0-beta.18
+
+- #1056 avoid panicking when we couldn't read imap-server's greeting
+  message 
+
+- #1055 avoid panicking when we don't have a selected folder
+
+- #1052 #1049 #1051 improve logging to add thread-id/name and
+  file/lineno to each info/warn message.
+
+- #1050 allow python bindings to initialize Account with "os_name".
+
+
 ## 1.0.0-beta.17
 
 - #1044 implement avatar recoding to 192x192 in core to keep file sizes small. 
diff --git a/Cargo.lock b/Cargo.lock
index 1e21e8d57..9d4d5b3d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -657,7 +657,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.17"
+version = "1.0.0-beta.18"
 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)",
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.17"
+version = "1.0.0-beta.18"
 dependencies = [
- "deltachat 1.0.0-beta.17",
+ "deltachat 1.0.0-beta.18",
  "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 5644f2405..0b5091fa1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.17"
+version = "1.0.0-beta.18"
 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 08a9524c1..3d74fca12 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.17"
+version = "1.0.0-beta.18"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"