clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Michael Vogel 2015-04-09 19:49:57 +02:00
parent 98bf8d85fa e955f013ca
commit 26eceaacbe
7 changed files with 21944 additions and 21760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11830
view/cs/messages.po
View File

File diff suppressed because it is too large Load Diff

2755
view/cs/strings.php
View File

File diff suppressed because it is too large Load Diff

11822
view/de/messages.po
View File

File diff suppressed because it is too large Load Diff

2737
view/de/strings.php
View File

File diff suppressed because it is too large Load Diff

11822
view/fr/messages.po
View File

File diff suppressed because it is too large Load Diff

2737
view/fr/strings.php
View File

File diff suppressed because it is too large Load Diff

1
view/theme/frost-mobile/templates/head.tpl
View File

@ -4,6 +4,7 @@
<base href="{{$baseurl}}/" /> <base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" /> <meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <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" /> <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />