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

6e5573ac

Commit 6e5573ac authored 12 years ago by Tom Needham

Downloads
- Plain Diff

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

parents 5323983f 2c1c1ba8

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

apps/contacts/css/jquery.Jcrop.css 1 addition, 1 deletion

apps/contacts/css/jquery.Jcrop.css
apps/files_versions/appinfo/app.php 2 additions, 2 deletions

apps/files_versions/appinfo/app.php
apps/gallery/appinfo/app.php 8 additions, 8 deletions

apps/gallery/appinfo/app.php
apps/gallery/index.php 1 addition, 1 deletion

apps/gallery/index.php
apps/gallery/js/pictures.js 1 addition, 1 deletion

apps/gallery/js/pictures.js
apps/gallery/lib/tiles.php 1 addition, 1 deletion

apps/gallery/lib/tiles.php
apps/media/appinfo/app.php 3 additions, 3 deletions

apps/media/appinfo/app.php
apps/user_ldap/lib_ldap.php 16 additions, 5 deletions

apps/user_ldap/lib_ldap.php
lib/app.php 3 additions, 3 deletions

lib/app.php
lib/config.php 1 addition, 1 deletion

lib/config.php
lib/db.php 1 addition, 1 deletion

lib/db.php
lib/installer.php 12 additions, 11 deletions

lib/installer.php
lib/migrate.php 4 additions, 4 deletions

lib/migrate.php
search/js/result.js 4 additions, 14 deletions

search/js/result.js

with 58 additions and 56 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