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

2d3c7091

Commit 2d3c7091 authored 13 years ago by Frank Karlitschek

Downloads
- Plain Diff

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

parents db77dc91 a6ff9099

Branches

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

apps/user_ldap/appinfo/app.php 0 additions, 6 deletions

apps/user_ldap/appinfo/app.php
apps/user_ldap/appinfo/update.php 24 additions, 0 deletions

apps/user_ldap/appinfo/update.php
apps/user_ldap/lib_ldap.php 29 additions, 17 deletions

apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php 2 additions, 2 deletions

apps/user_ldap/settings.php
index.php 1 addition, 1 deletion

index.php
lib/util.php 1 addition, 1 deletion

lib/util.php

with 57 additions and 27 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