From bfbac67d2a07a0df4c45c4fe0ce64e957c6bc5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 10 Nov 2021 15:48:59 +0100
Subject: [PATCH] Bump version to 1.2.10
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     | 10 ++++++++++
 appinfo/info.xml |  2 +-
 package.json     |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32e67e8de..04e935576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.2.10
+
+### Fixed
+
+- #3394 Use displayname instead of uid for mentions (reopened against master)
+
+### Other
+
+- #3409 Keep exceptions http response generic
+
 
 ## 1.2.9
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2bbdd2447..f81fde51c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.2.9</version>
+    <version>1.2.10</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
diff --git a/package.json b/package.json
index af14ae9ae..d7f33c3a1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "deck",
 	"description": "",
-	"version": "1.2.9",
+	"version": "1.2.10",
 	"authors": [
 		{
 			"name": "Julius Härtl",