summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-05-18 13:45:45 +0200
committerChristian Grothoff <christian@grothoff.org>2017-05-18 13:45:45 +0200
commit3875acca7ff2142a4a5eaaf0376bd017a5cc63d2 (patch)
tree502e39a952886277f454184ba8c7752e5d2742b0 /common
parent603e50d1e19427eba5dfb35e7113f4dfdaaa8c62 (diff)
parent0fb1d29fc6aa9f748a58ecee3d9b7445ed59fc8e (diff)
downloadwww-3875acca7ff2142a4a5eaaf0376bd017a5cc63d2.tar.gz
www-3875acca7ff2142a4a5eaaf0376bd017a5cc63d2.tar.bz2
www-3875acca7ff2142a4a5eaaf0376bd017a5cc63d2.zip
Merge branch 'master' into stable
Diffstat (limited to 'common')
-rw-r--r--common/navigation.j2.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 9567fb97..d6204420 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -10,6 +10,7 @@
<ul class="dropdown-menu">
<li><a href="architecture.html">System Architecture</a></li>
<li><a href="faq.html">FAQ</a></li>
+ <li><a href="glossary.html">Glossary</a></li>
<li><a href="developers.html">Developer Introduction</a></li>
<li><a href="bibliography.html">Bibliography</a></li>
</ul>