From f8d855cc3ad606333ea5bbad704e5c03b8505467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 30 Aug 2019 11:41:41 +0200
Subject: [PATCH] Prepare 3.4.0-beta1
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     | 13 +++++++++++++
 appinfo/info.xml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66aad4979..93fceea3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 3.4.0 - unreleased
+
+### Added
+
+- Federated document editing
+- Watermarking
+
+### Fixed
+- General frontend refactoring to fix flaws in files app integration and performance issues
+- Check for type when uploading a template
+- Use proper public url instead of regular wopi endpoint to fix issues in locked down environments
+- Open file directly if only one template is available
+
 ## 3.3.15
 
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index d6a1ac4cd..94d755ad8 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>Collabora Online</name>
 	<summary>Edit office documents directly in your browser.</summary>
 	<description>This application can connect to a Collabora Online server (WOPI Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.</description>
-	<version>3.3.13</version>
+	<version>3.4.0-beta1</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>