diff options
| author | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
| commit | 1aa522e138d45b7e06223d0cebb4a4363d9dda5b (patch) | |
| tree | 880a1adfe1a66ead083f66b00720bb1c5175f674 /templates/header.html | |
| parent | 88c1205e422b314cae2c0410ce21f9c8283f0f0e (diff) | |
| parent | 46edec0f2d8c31b55e36e160c7d9bac8bf4d3aa4 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/index.html
templates/post_thread.html
templates/thread.html
Diffstat (limited to 'templates/header.html')
| -rw-r--r-- | templates/header.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/header.html b/templates/header.html index 95e0bc09..be9cdaad 100644 --- a/templates/header.html +++ b/templates/header.html @@ -4,6 +4,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes"> {% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %} {% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %} + {% if config.font_awesome %}<link rel="stylesheet" media="screen" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %} <script type="text/javascript">var configRoot="{{ config.root }}";</script> {% if not nojavascript %} <script type="text/javascript" src="{{ config.url_javascript }}"></script> |