tree a9b5eb1f442e1d8f268581f5dcac3ba340b249b1
parent 7175bb93c1011bd80116298f044ad10aa8643c91
parent 2509cfd84eb9734ab1cde5321d6c736450711f01
author Luca Milanesio <luca.milanesio@gmail.com> 1702586320 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1702586320 +0000

Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Fix merge Ib6aa8adbd causing 2x updates of refs/multi-site/version/*

Change-Id: I5d2c7347b2d8c83671610f986939bf68b6b7846b