Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

61c4f9b3

Commit 61c4f9b3 authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud

parents 59d4ddd9 8d14c489

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/calendar/templates/settings.php 3 additions, 0 deletions

apps/calendar/templates/settings.php
apps/contacts/appinfo/app.php 3 additions, 0 deletions

apps/contacts/appinfo/app.php
apps/contacts/settings.php 6 additions, 0 deletions

apps/contacts/settings.php
apps/contacts/templates/settings.php 7 additions, 0 deletions

apps/contacts/templates/settings.php
apps/media/appinfo/app.php 1 addition, 0 deletions

apps/media/appinfo/app.php
apps/media/settings.php 6 additions, 0 deletions

apps/media/settings.php
apps/media/templates/settings.php 7 additions, 0 deletions

apps/media/templates/settings.php
core/css/styles.css 2 additions, 2 deletions

core/css/styles.css
core/templates/layout.guest.php 1 addition, 1 deletion

core/templates/layout.guest.php

with 36 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment