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

62f4ed70

Commit 62f4ed70 authored 11 years ago by Florin Peter

Downloads
- Plain Diff

Merge branch 'master' into fixes_for_3641_3620

parents 85668817 8edb56de

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CONTRIBUTING.md 12 additions, 8 deletions

CONTRIBUTING.md
lib/db.php 2 additions, 6 deletions

lib/db.php
lib/files/cache/backgroundwatcher.php 5 additions, 5 deletions

lib/files/cache/backgroundwatcher.php
lib/files/cache/cache.php 46 additions, 67 deletions

lib/files/cache/cache.php
lib/files/cache/legacy.php 7 additions, 8 deletions

lib/files/cache/legacy.php
lib/files/cache/permissions.php 19 additions, 21 deletions

lib/files/cache/permissions.php
lib/files/cache/storage.php 7 additions, 6 deletions

lib/files/cache/storage.php
lib/files/cache/upgrade.php 2 additions, 2 deletions

lib/files/cache/upgrade.php
lib/files/mapper.php 13 additions, 13 deletions

lib/files/mapper.php
lib/template.php 1 addition, 1 deletion

lib/template.php

with 114 additions and 137 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