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

3fc5b342

Commit 3fc5b342 authored 11 years ago by Björn Schießle

Downloads
- Plain Diff

Merge branch 'master' into encryption_check_php_version

Conflicts:
	apps/files_encryption/files/error.php

parents 38ed0039 29dd7eda

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/ajax/upload.php 35 additions, 35 deletions

apps/files/ajax/upload.php
apps/files/js/filelist.js 1 addition, 1 deletion

apps/files/js/filelist.js
apps/files_encryption/files/error.php 1 addition, 1 deletion

apps/files_encryption/files/error.php
lib/db.php 88 additions, 102 deletions

lib/db.php
lib/request.php 14 additions, 8 deletions

lib/request.php
settings/js/apps.js 10 additions, 1 deletion

settings/js/apps.js
settings/templates/apps.php 1 addition, 1 deletion

settings/templates/apps.php
tests/data/db_structure2.xml 2 additions, 1 deletion

tests/data/db_structure2.xml
tests/lib/dbschema.php 37 additions, 43 deletions

tests/lib/dbschema.php

with 189 additions and 193 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