tree 040a2f03431f06743f5d17bb0de821bec33cdccb
parent 40d7f40d4d25610b9c23baaacf17c6f9f1cd82f0
parent 4a9ffec296fa2b5c1343e73d45fed5c48e4a39b0
author David Ostrovsky <david@ostrovsky.org> 1610663895 +0100
committer David Ostrovsky <david@ostrovsky.org> 1610663905 +0100

Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Update git submodules
  Update git submodules
  AccountResolver: limit number of ambiguous accounts in error message
  Update highlightjs to 10.5.0

Change-Id: Ic4f3ba0a8699a2d239956f212ad7400064f43efa