From 56d179d3884444c0fe0e3e976dcb8553c4e3c07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 2 Jun 2020 13:50:01 +0200
Subject: [PATCH] Bump version to 3.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 CHANGELOG.md     | 18 ++++++++++++++++++
 appinfo/info.xml |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea2151966..cd24f9e88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.7.0
+
+### Added
+- Add support for built-in CODE server
+- Inform user about web server configuration issues
+- Document templates: use only one sans-serif font family
+- Viewer integration
+
+### Fixed
+- Fix CSP violation when collabora server has so-called 'service root'
+- Allow connecting to local addresses
+- Avoid duplicate save requests
+- Avoid additional HTTP request on the files app
+- Reduce requests for loaded CSS files
+- Fix certificate validation handling
+- Be more robust on paths that don't start with a slash
+- Bring back IE11 support
+
 ## 3.6.0
 
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0d19cc769..e435d8a04 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>3.7.0-beta3</version>
+	<version>3.7.0</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>