Merge branch 'dev' into custom_port

This commit is contained in:
Jean-Christophe Saad-Dupuy 2013-10-07 12:39:29 +02:00
commit 3352332f3f

View File

@ -8,4 +8,4 @@
<link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
<link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
<script src="href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }/js/jquery-2.0.3.min.js"></script>
<script src="href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>