about summary refs log tree commit diff
path: root/chart
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-10-26 15:47:21 +0100
committerThibaut Girka <thib@sitedethib.com>2020-10-26 15:48:16 +0100
commit9c34090db84fc28bf6c40da700095f025f1887ea (patch)
tree960afb18131d57f7120c0d584915f0c2c29902bb /chart
parent36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff)
parent3678b10823a691256ad63c1c4df8dc659dfc3bc0 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
Diffstat (limited to 'chart')
-rw-r--r--chart/values.yaml.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/chart/values.yaml.template b/chart/values.yaml.template
index c18d2f0b5..c1dc29f57 100644
--- a/chart/values.yaml.template
+++ b/chart/values.yaml.template
@@ -4,7 +4,7 @@ image:
   repository: tootsuite/mastodon
   pullPolicy: Always
   # https://hub.docker.com/r/tootsuite/mastodon/tags
-  tag: v3.2.0
+  tag: v3.2.1
   # alternatively, use `latest` for the latest release or `edge` for the image
   # built from the most recent commit
   #