Merge "Add CODE_OF_CONDUCT.md"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Jun 2017 19:58:10 +0000 (19:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Jun 2017 19:58:10 +0000 (19:58 +0000)

Trivial merge