Commit 1196ec54 authored by Jean Michel Rouly's avatar Jean Michel Rouly
Browse files

Merge branch 'master' of

parents dd67b700 d0d23909
......@@ -13,9 +13,10 @@
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a href="{{ url_for('projects')}}">Projects</a></li>
<li><a href="{{ url_for('people')}}">People</a></li>
<li><a href=" // ">Events</a></li>
<li><a href="{{ url_for('calendar')}}">Calendar</a>
<li><a href="">Blog</a>
<li><a href="{{ url_for('people')}}">People</a></li>
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
......@@ -29,7 +30,6 @@
<li><a href="{{ url_for('contact')}}">Contact</a>
<li><a href="">Blog</a>
</div><!--/.nav-collapse -->
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment