aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-25 15:47:38 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-25 15:47:38 -0800
commit0fd097b9a0f120b5fe706b288a1227ab2a16b4af (patch)
treed7cc08c0cda4526e8b1f6c170e28031ffe77e273
parentb3db182886fccb2220b8aa0a2389cf1c2e12aadb (diff)
parente8d56ca863b146720bdf05b54c7c1e379d3d57b7 (diff)
downloadgit-0fd097b9a0f120b5fe706b288a1227ab2a16b4af.tar.xz
Merge branch 'tb/coc-plc-update'
Document Taylor as a new member of Git PLC at SFC. Welcome. * tb/coc-plc-update: CODE_OF_CONDUCT.md: update PLC members list
-rw-r--r--CODE_OF_CONDUCT.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 65651beada..0215b1fd4c 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -70,8 +70,8 @@ git@sfconservancy.org, or individually:
- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Christian Couder <christian.couder@gmail.com>
- - Jeff King <peff@peff.net>
- Junio C Hamano <gitster@pobox.com>
+ - Taylor Blau <me@ttaylorr.com>
All complaints will be reviewed and investigated promptly and fairly.