diff options
| author | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
| commit | 3dada39bece8fa8b262ba3a69338876e952f28b1 (patch) | |
| tree | 86f4912c607485265dc73a456054c8bdaa0a099b /2020.md | |
| parent | 2448dbcf9afdb25df9f52411973f2bc79ad21ad4 (diff) | |
| parent | c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e (diff) | |
| download | emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.tar.xz emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.zip | |
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
Diffstat (limited to '2020.md')
| -rw-r--r-- | 2020.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ EmacsConf 2020 | Online Conference | **November 28 and 29, 2020** [[!img /i/emacsconf-logo1-256.png alt="EmacsConf logo" class="center"]] [[**Talks**|talks]] | [[**Poster**|poster]] | [[Planning]] | -[[Code of Conduct|conduct]] +[[Guidelines for Conduct|conduct]] EmacsConf is the conference about the joy of Emacs, Emacs Lisp, and memorizing key sequences. |