From 99dacb6038c1084a59c9e95e2b4f376aed1de5c1 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 20 Apr 2022 20:17:23 +0200
Subject: [PATCH] Release 2.1.0-rc.2

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 CHANGELOG.md    | 27 +++++++++++++++++++++++++++
 js/package.json |  2 +-
 mix.exs         |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c1cb455..b2c3d13d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.1.0-rc.2 - 2022-04-20
+
+Changes since rc.1:
+* Hide the whole metadata block if group has no description
+* Increase task timeout in Refresher to 60 seconds
+* Allow webfinger to be fetched over http (not https) in dev mode
+* Fix rejecting instance follow
+* Allow instance to have non-standard ports
+* Improve reactions when approving/rejecting an instance follow
+* Improve instance admin view for mobile
+* Allow to reject instance following
+* Fix pagination of group events
+* Add pagination to the instances list
+* Upgrade deps
+* Eventually fetch actors in mentions
+* Add proper fallback for when a TZ isn't registered
+* Improve IdentityPicker
+* Hide side of report modal on low width screens
+* Improve JoinGroupWithAccount component
+* Various group and posts improvements
+* Fix Telegram Logo being replaced with Mastodon logo in ShareGroupModal
+* Change URL to Mastodon Share Manager
+* Improve ActorInline component
+* Avoid assuming we're on Debian-based in release build
+* Fix receiving Flag activities on federated events
+* Update schema.graphql file
+
 ## 2.1.0-rc.1 - 2022-04-18
 
 Changes since beta.3:
diff --git a/js/package.json b/js/package.json
index 4813ac143..bd7d13913 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobilizon",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/mix.exs b/mix.exs
index 6b578bee1..6f4d3695c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Mobilizon.Mixfile do
   use Mix.Project
 
-  @version "2.1.0-rc.1"
+  @version "2.1.0-rc.2"
 
   def project do
     [