Merge branch 'master' into v6

# Conflicts: # .github/workflows/dockerimage.yml
2026-02-04 14:05:01 +00:00 · 2023-07-07 09:27:42 +03:00 · 2023-07-06 16:19:05 +03:00 · 2023-07-06 14:09:54 +03:00 · 2023-06-13 14:12:11 +03:00 · 2023-06-13 14:10:38 +03:00
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -4,7 +4,7 @@ on:
  push:
    # Publish `master` as Docker `latest` image.
    branches:
-      - master
+      - master
      - v5
    # Publish `v1.2.3` tags as releases.
Author	SHA1	Message	Date
Dmitry	00501dcfd9	Merge branch 'master' into v6	2023-07-07 09:27:42 +03:00
Dmitry	52cf315925	Merge branch 'master' into v6 # Conflicts: # .github/workflows/dockerimage.yml	2023-07-06 16:19:05 +03:00
Dmitry	9b841befe5	bump squid to 6.1	2023-07-06 14:09:54 +03:00
Dmitry	2fe85c38de	bump squid to 6.0.3	2023-06-13 14:12:11 +03:00
Dmitry	17fb8d59a2	Merge branch 'master' into v6	2023-06-13 14:10:38 +03:00
Dmitry	09aba63183	push v6 images	2023-05-02 17:11:44 +03:00
Dmitry	358cbfef87	bump squid to 6.0.2	2023-05-02 15:53:55 +03:00