Merge remote-tracking branch 'origin/feature/set_favicon' into develop
This commit is contained in:
		
				commit
				
					
						1d11dfabaa
					
				
			
		
					 2 changed files with 3 additions and 0 deletions
				
			
		
							
								
								
									
										
											BIN
										
									
								
								digitalglarus/static/digitalglarus/img/favicon.ico
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								digitalglarus/static/digitalglarus/img/favicon.ico
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.1 KiB  | 
| 
						 | 
					@ -13,6 +13,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <title>Digital Glarus - {% block title %}Welcome{% endblock %}</title>
 | 
					    <title>Digital Glarus - {% block title %}Welcome{% endblock %}</title>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <!-- Favicon -->
 | 
				
			||||||
 | 
					    <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Bootstrap Core CSS -->
 | 
					    <!-- Bootstrap Core CSS -->
 | 
				
			||||||
    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
 | 
					    <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue