summaryrefslogtreecommitdiffstats
path: root/2022
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2022-10-04 09:35:58 -0400
committerSacha Chua <sacha@sachachua.com>2022-10-04 09:35:58 -0400
commit58e43fd5e234722df964eca9fc550531d57ecbba (patch)
tree28cff6d2c16413d098079e5c175310a850f96942 /2022
parent6692931352554b44965abe24a52f70bf44b7d6b9 (diff)
parent63361ffa4e13812c530b408e868b63ab8b859fad (diff)
downloademacsconf-wiki-58e43fd5e234722df964eca9fc550531d57ecbba.tar.xz
emacsconf-wiki-58e43fd5e234722df964eca9fc550531d57ecbba.zip
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
Diffstat (limited to '')
-rw-r--r--2022/organizers-notebook.org10
-rw-r--r--2022/talks/buttons.md2
-rw-r--r--2022/talks/fanfare.md2
-rw-r--r--2022/talks/haskell.md2
4 files changed, 8 insertions, 8 deletions
diff --git a/2022/organizers-notebook.org b/2022/organizers-notebook.org
index 29213ce5..f756a08b 100644
--- a/2022/organizers-notebook.org
+++ b/2022/organizers-notebook.org
@@ -169,7 +169,7 @@ We need time after the prerecs get submitted to:
- capture any extra info
- follow up with missing prerecs
-*** TODO Investigate streaming options, maybe OBS in the cloud :corwin:
+*** TODO Investigate streaming options, maybe OBS in the cloud :corwin:zaeph:
DEADLINE: <2022-11-20 Sun>
:PROPERTIES:
:CUSTOM_ID: obscloud
@@ -517,16 +517,16 @@ The roles below are related to the proposals in the early stages of the preparat
Saturday
| | Gen AM | Gen PM | Dev AM | Dev PM |
-| Host | zaeph | | bandali | |
-| Streamer | zaeph | | bandali | |
+| Host | zaeph | zaeph | bandali | |
+| Streamer | zaeph | zaeph | bandali | |
| Check-in | sachac | | | |
| IRC | sachac | | | |
| Pad | sachac | | | |
Sunday
| | Gen AM | Gen PM | Dev AM | Dev PM |
-| Host | zaeph | | bandali | |
-| Streamer | zaeph | | bandali | |
+| Host | zaeph | zaeph | bandali | |
+| Streamer | zaeph | zaeph | bandali | |
| Check-in | sachac | | | |
| IRC | sachac | | | |
| Pad | sachac | | | |
diff --git a/2022/talks/buttons.md b/2022/talks/buttons.md
index 8d97814d..7e8e8ced 100644
--- a/2022/talks/buttons.md
+++ b/2022/talks/buttons.md
@@ -7,7 +7,7 @@
# Linking personal info with Hyperbole implicit buttons
-Mats Lidell (He,Him,His)
+Mats Lidell (he/him/his, <mailto:matsl@gnu.org>)
[[!inline pages="internal(2022/info/buttons-before)" raw="yes"]]
diff --git a/2022/talks/fanfare.md b/2022/talks/fanfare.md
index 111ba56e..0a0a1e44 100644
--- a/2022/talks/fanfare.md
+++ b/2022/talks/fanfare.md
@@ -7,7 +7,7 @@
# Fanfare for the Common Emacs User
-John Cummings
+John Cummings (IRC: jrootabega, <mailto:john@rootabega.net>)
[[!inline pages="internal(2022/info/fanfare-before)" raw="yes"]]
diff --git a/2022/talks/haskell.md b/2022/talks/haskell.md
index 167ba211..88385322 100644
--- a/2022/talks/haskell.md
+++ b/2022/talks/haskell.md
@@ -7,7 +7,7 @@
# Haskell code exploration with Emacs
-Yuchen Pei (he/him/himself/his/his)
+Yuchen Pei (he/him/himself/his/his, IRC: dragestil, <mailto:id@ypei.org>)
[[!inline pages="internal(2022/info/haskell-before)" raw="yes"]]