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

b1c9785e

Commit b1c9785e authored 12 years ago by Sam Tuke

Downloads
- Plain Diff

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

Conflicts:
	apps/files_versions/lib/versions.php

parents a775deaf aec6eea2

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

apps/files_versions/ajax/rollbackVersion.php 0 additions, 2 deletions

apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/lib/versions.php 20 additions, 10 deletions

apps/files_versions/lib/versions.php
lib/filesystem.php 1 addition, 0 deletions

lib/filesystem.php
lib/filesystemview.php 2 additions, 2 deletions

lib/filesystemview.php

with 23 additions and 14 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