From 32da4bba330eeb63a17fa3eeca8ef161790699bc Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 8 Mar 2022 12:13:17 -0800
Subject: [PATCH] Version 2.6.0

---
 CHANGELOG             | 13 ++++++++++++-
 CloudronManifest.json |  5 +++--
 DESCRIPTION.md        |  2 --
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8e7272f..d37ffa1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -125,7 +125,18 @@
 [2.5.1]
 * Update base image to 3.2.0
 
-[2.5.2]
+[2.6.0]
 * Update PeerTube to 4.1.0
 * [Full changelog](https://github.com/Chocobozzz/PeerTube/releases/tag/v4.1.0)
+* Player improvements
+* Search improvements
+* Video imports
+* Add ability for users to delete individual elements in videos history
+* Show date and views counter in playlist element miniature #4396
+* Add norsk locale support
+* Check mute status and display mute badges in channel and account pages
+* Add No linguistic content video language option #4631
+* Don't send notifications to admins/moderators if an admin/moderator reported an abuse
+* Add ability for moderators/admins to edit any channel #4608
+* Add a refresh button to admin videos overview page #4753
 
diff --git a/CloudronManifest.json b/CloudronManifest.json
index d3e13aa..029859b 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "2.5.2",
+  "version": "2.6.0",
+  "upstreamVersion": "4.1.0",
   "id": "org.joinpeertube.cloudronapp",
   "title": "PeerTube",
   "author": "PeerTube developers",
@@ -37,7 +38,7 @@
   "changelog": "file://CHANGELOG",
   "postInstallMessage": "file://POSTINSTALL.md",
   "documentationUrl": "https://docs.cloudron.io/apps/peertube/",
-  "minBoxVersion": "6.2.0",
+  "minBoxVersion": "7.1.0",
   "manifestVersion": 2
 }
 
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index d42b8c1..78412c4 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,5 +1,3 @@
-This app packages PeerTube <upstream>4.1.0</upstream>
-
 ## About
 
 PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo.