jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into api

Browse source 
# Conflicts:
#	apps/note/forms.py
#	apps/note/urls.py
#	apps/note/views.py
This commit is contained in:
Yohann D'ANELLO 2020-02-16 22:25:00 +01:00
commit 00d560c20e
9 changed files with 125 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/base.html
View file

@ -52,7 +52,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="#"><i class="fa fa-coffee"></i> Consos</a>
<a class="nav-link" href="{% url 'note:consos' %}"><i class="fa fa-coffee"></i> Consos</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="{% url 'member:club_list' %}"><i class="fa fa-users"></i> Clubs</a>