[Pkg-owncloud-commits] [owncloud-client] 335/484: Merge branch 'master' of github.com:owncloud/mirall

[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 8852911f676e661648a5dd8ae2e5b8ad0abe6fdf
Merge: e38bc6e 459e200
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Nov 16 18:16:58 2015 +0100

    Merge branch 'master' of github.com:owncloud/mirall

 src/gui/sharedialog.cpp          |  1 +
 src/gui/sharedialog.ui           | 13 -------------
 src/gui/shareusergroupwidget.cpp | 41 ++++++++++++++++++++++++++--------------
 src/gui/shareusergroupwidget.ui  | 29 +++++++++++++++++++++++++++-
 4 files changed, 56 insertions(+), 28 deletions(-)

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