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

7222e5fb

Commit 7222e5fb authored 9 years ago by Lukas Reschke

Downloads
- Plain Diff

Merge pull request #18893 from owncloud/move-static-data

Move static data from config to resources/config/

parents 498e8f71 4201f594

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

core/js/mimetypelist.js 23 additions, 34 deletions

core/js/mimetypelist.js
lib/private/files/type/detection.php 22 additions, 13 deletions

lib/private/files/type/detection.php
lib/private/http/client/client.php 1 addition, 1 deletion

lib/private/http/client/client.php
lib/private/security/certificatemanager.php 1 addition, 1 deletion

lib/private/security/certificatemanager.php
lib/private/server.php 3 additions, 1 deletion

lib/private/server.php
lib/private/updater.php 0 additions, 7 deletions

lib/private/updater.php
resources/config/ca-bundle.crt 0 additions, 0 deletions

resources/config/ca-bundle.crt
resources/config/mimetypealiases.dist.json 1 addition, 1 deletion

resources/config/mimetypealiases.dist.json
resources/config/mimetypemapping.dist.json 1 addition, 1 deletion

resources/config/mimetypemapping.dist.json
tests/lib/files/type/detection.php 35 additions, 31 deletions

tests/lib/files/type/detection.php

with 87 additions and 90 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