aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default/_head.twig
diff options
context:
space:
mode:
authorJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>2013-10-07 14:25:24 +0200
committerJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>2013-10-07 14:25:24 +0200
commit5e07dc8b51f9612de5f5a00bbac399c777e82fa4 (patch)
tree66454b9a6dd4e8cd045dd8451a268cf914e583b8 /themes/default/_head.twig
parent2916d24b209e1e36cf22cb902d7e6dc34113c7e5 (diff)
parent894c36ea32d38d425e27dae43a29dcd9e669040e (diff)
downloadwallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.gz
wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.zst
wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.zip
Merge remote branch 'upstream/dev' into dev
Conflicts: themes/default/_head.twig
Diffstat (limited to 'themes/default/_head.twig')
-rw-r--r--themes/default/_head.twig2
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 9745459c..247b929e 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -8,4 +8,4 @@
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
10 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> 10 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
11 <script src="href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>