[Pkg-owncloud-commits] [owncloud] 116/457: Merge pull request #16516 from owncloud/fix-phpdoc-trait

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit d7b2bc9e2faa29cb7862e4d9aa2ffa98846f7298
Merge: 156881e 3d8ea96
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Fri May 22 09:47:59 2015 +0200

    Merge pull request #16516 from owncloud/fix-phpdoc-trait
    
    Fix PHPDoc

 lib/private/files/storage/common.php             |  2 ++
 lib/private/files/storage/local.php              |  2 ++
 lib/private/files/storage/localtempfiletrait.php | 10 ++++++----
 lib/private/files/storage/mappedlocal.php        |  2 ++
 lib/private/files/storage/wrapper/encryption.php |  4 ++++
 5 files changed, 16 insertions(+), 4 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git