Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow

2015-04-09 19:49:57 +02:00 · 2015-04-09 19:49:57 +02:00 · 26eceaacbe
commit 26eceaacbe
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
--- a/view/theme/frost-mobile/templates/head.tpl
+++ b/view/theme/frost-mobile/templates/head.tpl
@ -4,6 +4,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js"></script>

 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />