From 1eadfddbd21045960fb5ab5871fc68e232445409 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Thu, 10 Nov 2022 21:11:44 +0100
Subject: [PATCH] Bump to v3.5.3+1.2.2

---
 dist/nginx.conf         | 8 --------
 lib/mastodon/version.rb | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/dist/nginx.conf b/dist/nginx.conf
index 4abcf7ff03..5bc960e256 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -56,14 +56,6 @@ server {
     try_files $uri @proxy;
   }
 
-  location /web {
-    return 301 /$is_args$args;
-  }
-
-  location ~ ^/web(\/.*) {
-    return 301 $1$is_args$args;
-  }
-
   # If Docker is used for deployment and Rails serves static files,
   # then needed must replace line `try_files $uri =404;` with `try_files $uri @proxy;`.
   location = /sw.js {
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 11dd079b15..86d78f038e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.2.1'
+      '+1.2.2'
     end
 
     def to_a