Merge branch '5.6.x' into 5.7.x

2022-08-24 16:41:16 -05:00
parent 7d972b10db 1c014eb512
commit 517631eb8c
1 changed files with 1 additions and 1 deletions
--- a/git/hooks/prepare-forward-merge
+++ b/git/hooks/prepare-forward-merge
@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'

-$main_branch = "3.0.x"
+$main_branch = "6.0.x"

 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN