tree e9e2a6b67a8a82652b1593928799c4d7d796b8a4
parent 63a11fd075761b5aab3529235c89d99c7875d81b
parent d13c2b7d9ed7915c6d5469263d63cf58df95a59d
author Antonio Barone <syntonyze@gmail.com> 1601914780 +0200
committer Antonio Barone <syntonyze@gmail.com> 1601914780 +0200

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Ensure All-Users:refs/meta/external-ids doesn't cause split-brains

Change-Id: I531488e71e4929c2124f39da5b033df9f25f6861