eryn/rogueojiiofwales
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/ui' of github.com:erynofwales/rogueojiiofwales into feature/ui

Browse source 
Conflicts:
	templates/graph_base.html
	templates/navbar.html
This commit is contained in:
Eryn Wells 2012-08-18 17:09:56 -07:00
commit d3a949833d
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/navbar.html
View file

@ -23,6 +23,10 @@
<li><a href="#">Logout</a></li> <li><a href="#">Logout</a></li>
</ul> </ul>
</li> </li>
<li><a href="{% url index %}">Followers</a></li>
</ul>
<ul class="nav pull-right">
<li><a href="">Logout</a></li>
</ul> </ul>
</div> </div>
</div> </div>