diff options
| author | Swift Geek <swiftgeek@gmail.com> | 2017-09-03 22:17:06 +0000 |
|---|---|---|
| committer | Gogs <gogitservice@gmail.com> | 2017-09-03 22:17:06 +0000 |
| commit | 27de7f5f3f0efbd9450e75bb40b8fb212ddc1269 (patch) | |
| tree | 325e2deb732caf3ef5026dd36f04ff50c82f13a0 /www/conduct.md | |
| parent | 5e7b1de1df92d1db32f9e28516a99c1096ff90d5 (diff) | |
| parent | 9ee7a5a496b96ee934b90d2a126fa70d4c3994b4 (diff) | |
| download | librebootfr-27de7f5f3f0efbd9450e75bb40b8fb212ddc1269.tar.gz librebootfr-27de7f5f3f0efbd9450e75bb40b8fb212ddc1269.zip | |
Merge branch 'www/news-alyssa-resign' of libreboot/libreboot into master
Diffstat (limited to 'www/conduct.md')
| -rw-r--r-- | www/conduct.md | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/www/conduct.md b/www/conduct.md index aa8bea1e..313321c0 100644 --- a/www/conduct.md +++ b/www/conduct.md @@ -82,14 +82,13 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting one of the moderators privately via IRC private message (see list below): -* Alyssa Rosenzweig: **alyssa** on Freenode -* Andrew Robbins: **and\_who** on Freenode +* Andrew Robbins: **and\_who** on Freenode, email <mailto:andrew@libreboot.org> * Jason Self: **jxself** on Freenode -* Leah Rowe: **\_4of7** on Freenode +* Leah Rowe: **\_4of7** on Freenode, email <mailto:leah@libreboot.org> * Paul Kocialkowski: **paulk-X** Freenode (X is variable, for this - person. + person, email <mailto:paul@libreboot.org> check in the channel) -* Swift Geek: **swiftgeek** on Freenode +* Swift Geek: **swiftgeek** on Freenode, email <mailto:swiftgeek@libreboot.org> If the complaint is for abuses on the Libreboot subreddit at [r/libreboot](https://www.reddit.com/r/libreboot/) then there are a separate |