diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
| commit | 9898ba4daf1acdead2ed5fa6024e779caafb353e (patch) | |
| tree | 3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df /core/templates/layout.guest.php | |
| parent | 5062ae250b767867609f64c29ab4cde65f022b75 (diff) | |
| parent | 78fce834058a38a7dbcc5310e16095c743434bc6 (diff) | |
| download | nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.tar.gz nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
core/templates/installation.php
Diffstat (limited to 'core/templates/layout.guest.php')
| -rw-r--r-- | core/templates/layout.guest.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 69330aa9fce..b26020b766b 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,7 +4,8 @@ <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> - <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> @@ -30,6 +31,7 @@ </div></header> <?php echo $_['content']; ?> </div> - <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t( 'web services under your control' ); ?></p></footer> + <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – + <?php echo $l->t( 'web services under your control' ); ?></p></footer> </body> </html> |