diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-05-07 17:54:38 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-05-07 17:54:38 +0200 |
| commit | f569c721a64486d0e7c7e307ed77ac0caed2dc2d (patch) | |
| tree | df7b3399a858ffdae6bd6e66616746efbcee24bc /lib/private/appframework/http.php | |
| parent | 47d70da2f5cb55ad47023b061b68062dd8b8d8e2 (diff) | |
| parent | 254fa5eb22efa5ba572702064377a6ad9eec9a53 (diff) | |
| download | nextcloud-server-f569c721a64486d0e7c7e307ed77ac0caed2dc2d.tar.gz nextcloud-server-f569c721a64486d0e7c7e307ed77ac0caed2dc2d.zip | |
Merge branch 'master' into optimize-startup-queries
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
Diffstat (limited to 'lib/private/appframework/http.php')
0 files changed, 0 insertions, 0 deletions