Merge branch 'tb/coc-plc-update'

gitster · gitster · commit 0fd097b9a0f1 · 2022-02-25T15:47:38.000-08:00
Document Taylor as a new member of Git PLC at SFC.  Welcome.

* tb/coc-plc-update:
  CODE_OF_CONDUCT.md: update PLC members list
diff --git 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.
 

-Original file line number
+Diff line change
   - Ævar Arnfjörð Bjarmason <[email protected]>
   - Christian Couder <[email protected]>
 -  - Jeff King <[email protected]>
   - Junio C Hamano <[email protected]>
 +  - Taylor Blau <[email protected]>
 All complaints will be reviewed and investigated promptly and fairly.