tree 16b22d53eeea7afcf2b28c4fc6c6c7df3e2677df
parent 6349aac5ea26c5020ae3439a9338e3a1ce20d26f
parent ba12caab16320b21aec945abbf606b36dab0e8fa
author Hugo Arès <hugo.ares@ericsson.com> 1504744973 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1504746047 -0400

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Handle when uploader email matches more than one account

Change-Id: I46341cc90ff3bcbb6ed684d99705812cdef87ecd