Merge branch '2.3.x' into 2.4.x

4 years ago · 8478e86ac2
parent 08b692581a 4f3c7f9e56
commit 8478e86ac2
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'

-$master_branch = "2.4.x"
+$master_branch = "2.5.x"

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