From 6acd865a32ca3f90176ba53497d499f0f4300489 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 21 Apr 2023 23:20:49 +0200
Subject: [PATCH] mastodon: 4.1.1 -> 4.1.2

https://github.com/mastodon/mastodon/releases/tag/v4.1.2
---
 mastodon/docker-compose.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index 52d672d..b2d7abb 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -135,7 +135,11 @@ services:
 #      - triton.cns.services=mastodon-redis
 
   web:
+<<<<<<< Updated upstream
     image: tootsuite/mastodon:v4.1.1
+=======
+    image: tootsuite/mastodon:v4.1.2
+>>>>>>> Stashed changes
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -148,7 +152,11 @@ services:
       - triton.cns.services=mastodon-web
 
   streaming:
+<<<<<<< Updated upstream
     image: tootsuite/mastodon:v4.1.1
+=======
+    image: tootsuite/mastodon:v4.1.2
+>>>>>>> Stashed changes
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -161,7 +169,11 @@ services:
       - triton.cns.services=mastodon-streaming
 
   sidekiq:
+<<<<<<< Updated upstream
     image: tootsuite/mastodon:v4.1.1
+=======
+    image: tootsuite/mastodon:v4.1.2
+>>>>>>> Stashed changes
     mem_limit: 1g
     restart: always
     env_file: .env.production