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

fbb314ef

Commit fbb314ef authored 13 years ago by Jan-Christoph Borchardt

Downloads
- Plain Diff

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

parents f16cfbab 3b71e46c

No related branches found

No related tags found

Loading

Changes 14

Show whitespace changes

Inline Side-by-side

Showing

apps/contacts/appinfo/app.php 1 addition, 1 deletion

apps/contacts/appinfo/app.php
apps/user_ldap/appinfo/app.php 3 additions, 0 deletions

apps/user_ldap/appinfo/app.php
apps/user_ldap/group_ldap.php 82 additions, 0 deletions

apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php 118 additions, 0 deletions

apps/user_ldap/lib_ldap.php
apps/user_ldap/tests/group_ldap.php 36 additions, 0 deletions

apps/user_ldap/tests/group_ldap.php
core/js/js.js 8 additions, 2 deletions

core/js/js.js
lib/app.php 28 additions, 5 deletions

lib/app.php
lib/appconfig.php 34 additions, 0 deletions

lib/appconfig.php
lib/db.php 2 additions, 2 deletions

lib/db.php
lib/files.php 3 additions, 3 deletions

lib/files.php
lib/migrate.php 14 additions, 14 deletions

lib/migrate.php
lib/migration/content.php 9 additions, 9 deletions

lib/migration/content.php
lib/migration/provider.php 4 additions, 4 deletions

lib/migration/provider.php
settings/js/apps.js 2 additions, 2 deletions

settings/js/apps.js

with 344 additions and 42 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