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

ba246d3b

Commit ba246d3b authored 13 years ago by Jan-Christoph Borchardt

Downloads
- Plain Diff

Merge branch 'master' into interface

parents 43f99a89 5728f801

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

admin/appinfo/app.php 1 addition, 1 deletion

admin/appinfo/app.php
apps/media/ajax/api.php 3 additions, 0 deletions

apps/media/ajax/api.php
apps/media/appinfo/database.xml 18 additions, 0 deletions

apps/media/appinfo/database.xml
apps/media/lib_collection.php 27 additions, 1 deletion

apps/media/lib_collection.php
apps/media/lib_scanner.php 69 additions, 30 deletions

apps/media/lib_scanner.php
apps/user_openid/phpmyid.php 7 additions, 7 deletions

apps/user_openid/phpmyid.php
files/templates/admin.php 5 additions, 3 deletions

files/templates/admin.php
lib/filestorage.php 1 addition, 57 deletions

lib/filestorage.php
lib/helper.php 45 additions, 0 deletions

lib/helper.php
lib/log.php 4 additions, 4 deletions

lib/log.php
lib/ocs.php 18 additions, 58 deletions

lib/ocs.php

with 198 additions and 161 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