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

962e5484

Commit 962e5484 authored 14 years ago by Robin Appelman

Downloads
- Plain Diff

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

parents 4b0c953e e18898df

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

files/upload.php 1 addition, 3 deletions

files/upload.php
inc/MDB2/Driver/sqlite.php 1 addition, 1 deletion

inc/MDB2/Driver/sqlite.php
inc/User/database.php 3 additions, 0 deletions

inc/User/database.php
inc/lib_base.php 2 additions, 2 deletions

inc/lib_base.php
inc/lib_filestorage.php 57 additions, 44 deletions

inc/lib_filestorage.php
inc/templates/adminform.php 1 addition, 1 deletion

inc/templates/adminform.php
js/filebrowser.js 2 additions, 2 deletions

js/filebrowser.js
plugins/music/index.php 0 additions, 37 deletions

plugins/music/index.php
plugins/music/lib_music.php 0 additions, 29 deletions

plugins/music/lib_music.php
plugins/music/plugin.xml 0 additions, 14 deletions

plugins/music/plugin.xml
settings/index.php 2 additions, 2 deletions

settings/index.php

with 69 additions and 135 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