diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
| commit | 4c2cf35050032002d01978f53201723330ebfe16 (patch) | |
| tree | cb931972aae1381d0d46aa934fa56f462e4c873a /apps/media | |
| parent | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip | |
fix merge conflicts
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/templates/settings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php index 2907c616cf6..941c17ff597 100644 --- a/apps/media/templates/settings.php +++ b/apps/media/templates/settings.php @@ -2,6 +2,6 @@ <fieldset class="personalblock"> <strong>Media</strong><br /> Ampache address: - <?php echo OC_Helper::linkToAbsolute('media', ''); ?><br /> + <code><?php echo OC_Helper::linkToAbsolute('media', ''); ?></code><br /> </fieldset> </form> |