Merge branch '2.3'
authorChristian Kamm <mail@ckamm.de>
Thu, 8 Jun 2017 11:02:34 +0000 (13:02 +0200)
committerChristian Kamm <mail@ckamm.de>
Thu, 8 Jun 2017 11:02:34 +0000 (13:02 +0200)
commitaeeb408c744704d6653a75d75214336aedb3d47b
treea51544446b0109dd5975a5ea41d6af5cdb05d403
parent63c40b45e4153980599aa412c090f671158eeca8
parent18c39197e5814441c3c36a043d73acb922ffd081
Merge branch '2.3'
src/libsync/propagatedownload.cpp