[Pkg-owncloud-commits] [owncloud-client] 59/60: Merge branch '2.4' into 2.4.0-rc2

[Sandro Knauß]

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

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

commit 61939d67e6c3f2487f83cee9ac9d53454d136359
Merge: 47d282f 298f1ab
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Dec 15 11:56:27 2017 +0100

    Merge branch '2.4' into 2.4.0-rc2

 mirall.desktop.in  | 3 +++
 src/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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