Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 18 Oct 2016 06:56:30 +0000 (06:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 18 Oct 2016 06:56:30 +0000 (06:56 +0000)
commit0489eedef3b806c20122fdce13b03fa0c895cb05
treefcf6af12f5cb91bb2696010412e6c4af92d3126b
parent3588c0ac81701f617984178bb220eaad792982c3
parent25fd321ac256bbb9a4811722e67574344862c5c0
Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"