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

0df376d4

Commit 0df376d4 authored 12 years ago by Frank Karlitschek

Downloads
- Plain Diff

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

parents 16224e5e c1bb8139

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

apps/contacts/css/contacts.css
apps/files/css/files.css 1 addition, 1 deletion

apps/files/css/files.css
apps/user_ldap/appinfo/info.xml 1 addition, 1 deletion

apps/user_ldap/appinfo/info.xml
apps/user_ldap/appinfo/install.php 6 additions, 0 deletions

apps/user_ldap/appinfo/install.php
apps/user_ldap/appinfo/update.php 18 additions, 15 deletions

apps/user_ldap/appinfo/update.php
apps/user_ldap/appinfo/version 1 addition, 1 deletion

apps/user_ldap/appinfo/version
core/templates/login.php 1 addition, 1 deletion

core/templates/login.php

with 29 additions and 20 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