tree ccedf083aea813834d18c17e4b67ba1b227a5299
parent 183ea6b3f5f77079fb2dad413d1046dfaf760043
parent a0b3200ebca6f45dc1362287f1f74876f62fdb0f
author David Ostrovsky <david@ostrovsky.org> 1610663670 +0100
committer David Ostrovsky <david@ostrovsky.org> 1610663670 +0100

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: Ib49b3bb95a606db0d0418d9d2e467aadba330768