Olivier Goffart 597acba274 Merge remote-tracking branch 'origin/2.5' ... Conflicts: VERSION.cmake src/common/syncjournaldb.cpp src/libsync/propagatedownload.cpp		2019-02-08 12:48:31 +01:00
..
linux	admin/linux/Dockerfile: Add comments	2018-01-15 13:56:35 +01:00
osx	Sign Autoupdate.app	2019-02-05 09:48:30 +01:00
qt/patches
win	[tx-robot] updated from transifex	2019-01-17 01:15:22 +01:00
CMakeLists.txt