tree 713ebb9c1a205e21d527f2de904b6107e768eb72
parent 1d4772d058a46e4a3e6d9f9f583692bf28960db3
parent 4508c5d357dc5e1d7552230a35ca0a1a097eb128
author Antonio Barone <syntonyze@gmail.com> 1601915105 +0200
committer Antonio Barone <syntonyze@gmail.com> 1601915105 +0200

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I20e8133eb15dd081b2bf4cfba9ac60e8040091b1