[Pkg-owncloud-commits] [owncloud-client] 354/470: Merge pull request #4700 from owncloud/fix_4409

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 33459b48c81c903c2684392631ca8bee9c26b536
Merge: 038b7db 5989419
Author: Roeland Douma <rullzer at users.noreply.github.com>
Date:   Tue Apr 19 13:14:04 2016 +0200

    Merge pull request #4700 from owncloud/fix_4409
    
    Use expireDate if returned by the OCS Share API

 src/gui/share.cpp           | 14 ++++++++++++--
 src/gui/share.h             |  2 +-
 src/gui/sharelinkwidget.cpp |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

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