aboutsummaryrefslogtreecommitdiffstats
path: root/docs/_summary.md
diff options
context:
space:
mode:
authorBalz Guenat <balz.guenat@gmail.com>2017-08-12 12:14:33 +0200
committerBalz Guenat <balz.guenat@gmail.com>2017-08-12 12:14:33 +0200
commit430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch)
treef3d13283dd812277bc30d75dff32ea16508b58c8 /docs/_summary.md
parent175db1a549a46518c2f2511ac1624d594eb07216 (diff)
parent5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff)
downloadfirmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.gz
firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.bz2
firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.zip
Merge remote-tracking branch 'upstream/master'
# Conflicts: # docs/faq_keymap.md
Diffstat (limited to 'docs/_summary.md')
-rw-r--r--docs/_summary.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_summary.md b/docs/_summary.md
index 723377de9..0f65de0dd 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -17,6 +17,7 @@
* [Mouse keys](mouse_keys.md)
* [Unicode](unicode.md)
* [Stenography](stenography.md)
+ * [Key Lock](key_lock.md)
* Reference
* [Glossary](glossary.md)