summary refs log tree commit diff stats
path: root/docs/devel/index.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/devel/index.rst')
-rw-r--r--docs/devel/index.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/devel/index.rst b/docs/devel/index.rst
index 60039faa68..6cf7e2d233 100644
--- a/docs/devel/index.rst
+++ b/docs/devel/index.rst
@@ -14,6 +14,8 @@ Contents:
    :maxdepth: 2
    :includehidden:
 
+   code-of-conduct
+   conflict-resolution
    build-system
    style
    kconfig