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

1338279c

Commit 1338279c authored 12 years ago by Björn Schießle

Downloads
- Plain Diff

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

parents 34739b7e 49d9eb7a

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/calendar/ajax/events.php 1 addition, 1 deletion

apps/calendar/ajax/events.php
apps/calendar/lib/app.php 3 additions, 0 deletions

apps/calendar/lib/app.php
apps/files_versions/js/settings-personal.js 33 additions, 45 deletions

apps/files_versions/js/settings-personal.js
lib/util.php 46 additions, 7 deletions

lib/util.php
settings/admin.php 2 additions, 0 deletions

settings/admin.php
settings/css/settings.css 4 additions, 1 deletion

settings/css/settings.css
settings/templates/admin.php 15 additions, 0 deletions

settings/templates/admin.php

with 104 additions and 54 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