]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Merge remote-tracking branch 'origin/2.2'
authorChristian Kamm <mail@ckamm.de>
Wed, 28 Sep 2016 10:07:45 +0000 (12:07 +0200)
committerChristian Kamm <mail@ckamm.de>
Wed, 28 Sep 2016 10:07:45 +0000 (12:07 +0200)
1  2 
src/libsync/propagatedownload.cpp

Simple merge