Julius Härtl 689ab5b8b3 Merge branch 'master' into upstream/owncloudsynclog		2018-06-07 14:38:49 +02:00
..
3rdparty	sqlite: Update bundled version to 3.23.1	2018-06-06 20:40:23 +02:00
cmd	owncloudcmd: Do not overwrite the http timeout for json jobs	2018-05-31 21:56:55 +02:00
common	macOS: Don't use WAL for sqlite3 in /Volumes	2018-06-07 10:22:07 +02:00
crashreporter	Fix windows cross build of the updater and bump libcrashreporter-qt revision	2018-01-14 00:45:02 +01:00
csync	Fix output add E2E again	2018-06-05 09:02:41 +02:00
gui	Merge branch 'master' into upstream/owncloudsynclog	2018-06-07 14:38:49 +02:00
libsync	Upload: Adjust timeout for final job based on size #6527	2018-06-07 09:38:16 +02:00
CMakeLists.txt	Add QWebView as a dependency	2018-05-02 22:50:48 +02:00