diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:08:41 +0200 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:08:41 +0200 |
| commit | 9d7a02afcee3c740712a7c95182d332db0504b7e (patch) | |
| tree | 3266e3d3bfec6a3ac075084cbec07ba4090c4cd2 /tpl/default/includes.html | |
| parent | c318096c7a6fb3f6b00bd8c694ab7acb8fbb7cd0 (diff) | |
| parent | 7c2460c856c1d561b8347316f3045208f9f3d24e (diff) | |
| download | Shaarli-9d7a02afcee3c740712a7c95182d332db0504b7e.tar.gz Shaarli-9d7a02afcee3c740712a7c95182d332db0504b7e.tar.zst Shaarli-9d7a02afcee3c740712a7c95182d332db0504b7e.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'tpl/default/includes.html')
| -rw-r--r-- | tpl/default/includes.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 91c6ca3b..0350ef66 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <link type="text/css" rel="stylesheet" href="css/font-awesome.min.css" /> | 11 | <link type="text/css" rel="stylesheet" href="css/font-awesome.min.css" /> |
| 12 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> | 12 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> |
| 13 | <link type="text/css" rel="stylesheet" href="css/shaarli.css" /> | 13 | <link type="text/css" rel="stylesheet" href="css/shaarli.css" /> |
| 14 | {if="is_file('inc/user.css')"} | 14 | {if="is_file('data/user.css')"} |
| 15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> | 15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> |
| 16 | {/if} | 16 | {/if} |
| 17 | {loop="$plugins_includes.css_files"} | 17 | {loop="$plugins_includes.css_files"} |