Skip to content
Commit 57443568 authored by Olivier Goffart's avatar Olivier Goffart
Browse files

Merge remote-tracking branch 'origin/2.3' 

 Conflicts:
	src/libsync/owncloudpropagator.cpp
parents fce194ce 1a279ca1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment