summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2021-11-27 08:29:30 -0500
committerSacha Chua <sacha@sachachua.com>2021-11-27 08:29:30 -0500
commit329f58486f0d9f2887e6e8a0d726d5b158afbc5c (patch)
treed1228e697f488e520ecf3bce9251b1cbb06bc07e
parent5cc4f104f44229637999b4daf97fb30ae8ab0a35 (diff)
downloademacsconf-wiki-329f58486f0d9f2887e6e8a0d726d5b158afbc5c.tar.xz
emacsconf-wiki-329f58486f0d9f2887e6e8a0d726d5b158afbc5c.zip
Add Toobnix
-rw-r--r--2021.md14
1 files changed, 6 insertions, 8 deletions
diff --git a/2021.md b/2021.md
index 987a4ec3..32536473 100644
--- a/2021.md
+++ b/2021.md
@@ -14,10 +14,6 @@ alt="EmacsConf logo"]]</p>
<a href="https://www.gnu.org/software/emacs/">Emacs</a> and
Emacs Lisp.</p>
-We are busy putting things together for EmacsConf 2021, and we would
-love to have *your* help to make EmacsConf 2021 amazing, much like the
-previous EmacsConfs. [[Learn how you can help!|contribute]]
-
We are holding EmacsConf 2021 as an online conference again this year.
We remain fully committed to freedom, and we will continue using our
infrastructure and streaming setup consisting entirely of [free
@@ -28,10 +24,8 @@ software][freesw], much like previous EmacsConf conferences.
On November 27 and 28, you will be able to watch the livestreams via
<https://live.emacsconf.org>, which will also have details on how to
watch the streams using media players that support streaming (like mpv
-and VLC).
-
-In the meantime, please feel free to enjoy the videos from [[2020]]
-and previous years.
+and VLC). You can also watch via
+[Toobnix](https://toobnix.org/w/dL9uREZZYaiHZia7S2yCVU).
## Participating
@@ -65,6 +59,10 @@ There is also an alternate stream suitable for APAC hours, see
## Thanks
+We are busy putting things together for EmacsConf 2021, and we would
+love to have *your* help to make EmacsConf 2021 amazing, much like the
+previous EmacsConfs. [[Learn how you can help!|contribute]]
+
- Volunteers:
- bandali (Amin Bandali): main organization, communications
- zaeph (Leo Vivier): meeting chair, notes, communications