Merge branch 'master' into type-hinting-sharing (66b1ad0a) · Commits · github / nextcloud / server

Commit 66b1ad0a authored Apr 28, 2014 by

Bart Visscher

Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment