Merge branch '2.3'
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 3 Mar 2017 09:57:23 +0000 (10:57 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 3 Mar 2017 09:57:23 +0000 (10:57 +0100)
commit13df7fcee0a2ef745eeed80cb8129b199ba9554c
treee368e2b279cb323ad8c5b521518c20718ff09be3
parent6e4ecd11a1ac77e27403f96f81b6e51da9700adc
parent84ecbc4c891bfc09eda24a7d9b16cf3d36d18ac3
Merge branch '2.3'

 Conflicts:
src/libsync/owncloudpropagator.cpp