[Pkg-owncloud-commits] [owncloud-client] 214/218: Merge branch '2.0' of github.com:owncloud/mirall into 2.0

[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 af721118cd38a622fb37102939832fd8403babd5
Merge: 1790a12 0d5f2b5
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Oct 16 10:08:27 2015 +0200

    Merge branch '2.0' of github.com:owncloud/mirall into 2.0

 src/libsync/propagateupload.cpp | 1 +
 src/libsync/syncjournaldb.cpp   | 1 +
 2 files changed, 2 insertions(+)

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