tree 3177eb81d4ee3d3f0d098e52fe6a968ccb0cb542
parent 4c48e14b3456d724d90371cdc6ecb0f47c1eaf2c
parent dfcee56656c4125196037b85895b37374210e59f
author Luca Milanesio <luca.milanesio@gmail.com> 1735643253 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1735643253 +0000

Merge branch 'stable-3.11'

* stable-3.11:
  Do not throw an exception when refs/multi-site/version lock fails
  Reformat with GJF 1.24.0

Change-Id: I7220719b6bbebd93d3e57f7a10967f3d97ee6879