aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
rascencio 2015-09-20 20:20:26 +02:00
commit a4095f42e2
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
digitalglarus/static/digitalglarus/img/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
digitalglarus/templates/digitalglarus/base.html
View file

@ -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">