Merge pull request #5102 from owncloud/chunking-ng

author Markus Goetz <markus@woboq.com>

Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)

committer GitHub <noreply@github.com>

Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)
author Markus Goetz <markus@woboq.com>
Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)
committer GitHub <noreply@github.com>
Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)
diff --cc src/libsync/owncloudpropagator.cpp
Simple merge
diff --cc src/libsync/owncloudpropagator.h
Simple merge
diff --cc test/syncenginetestutils.h
Simple merge
author	Markus Goetz <markus@woboq.com>
	Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)
committer	GitHub <noreply@github.com>
	Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)
		1	2
src/libsync/owncloudpropagator.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsync/owncloudpropagator.h	patch \|	diff1 \|	diff2 \|	blob \| history
test/syncenginetestutils.h	patch \|	diff1 \|	diff2 \|	blob \| history