Merge remote-tracking branch 'origin/main' into main

# Conflicts: # .github/workflows/docker-publish.yml # build.sbt
lhns · Aug 10, 2021 · 75fb108 · 75fb108
2 parents 7007fb3 + 8d65895
commit 75fb108
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.3
+sbt.version=1.5.5
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")