Merge branch 'master' of github.com:ungleich/dynamicweb
This commit is contained in:
		
				commit
				
					
						4f40fd1efa
					
				
			
		
					 695 changed files with 94995 additions and 5257 deletions
				
			
		|  | @ -15,15 +15,15 @@ | |||
|             <span class="icon-bar"></span> | ||||
|             <span class="icon-bar"></span> | ||||
|           </button> | ||||
|           <a class="navbar-brand" href="#"><span>Brand</span></a> | ||||
|           <a class="navbar-brand" href="#"><span>Digital Glarus</span></a> | ||||
|         </div> | ||||
|         <div class="collapse navbar-collapse" id="navbar-ex-collapse"> | ||||
|           <ul class="nav navbar-nav navbar-right"> | ||||
|             <li class="active"> | ||||
|               <a href="#">Home</a> | ||||
|               <a href="{% url 'digitalglarus:index' %}">Home</a> | ||||
|             </li> | ||||
|             <li> | ||||
|               <a href="#">Contacts</a> | ||||
|               <a href="{% url 'digitalglarus:contact' %}">Contacts</a> | ||||
|             </li> | ||||
|           </ul> | ||||
|         </div> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue