summaryrefslogtreecommitdiffstats
path: root/2020/sidebar.md
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2021-01-16 00:09:12 -0500
committerSacha Chua <sacha@sachachua.com>2021-01-16 00:09:12 -0500
commit3dada39bece8fa8b262ba3a69338876e952f28b1 (patch)
tree86f4912c607485265dc73a456054c8bdaa0a099b /2020/sidebar.md
parent2448dbcf9afdb25df9f52411973f2bc79ad21ad4 (diff)
parentc1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e (diff)
downloademacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.tar.xz
emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.zip
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
Diffstat (limited to '2020/sidebar.md')
-rw-r--r--2020/sidebar.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/2020/sidebar.md b/2020/sidebar.md
index d6584f7d..f9c053fe 100644
--- a/2020/sidebar.md
+++ b/2020/sidebar.md
@@ -5,4 +5,4 @@
---
* [[**Talks**|talks]]
-* [[Code of Conduct|conduct]]
+* [[Guidelines for Conduct|conduct]]