Roeland Jago Douma ef15534c64 Merge branch 'master' into margins		2018-11-04 19:40:40 +01:00
..
3rdparty	Merge pull request #654 from nextcloud/upstream/sqlite-version-3-24	2018-10-19 16:03:04 +02:00
cmd	Fix the hiddensync state in the UI + also sync hidden in cmd	2018-09-01 16:30:27 +02:00
common	Merge pull request #663 from nextcloud/upstream/pr/6707	2018-10-30 22:40:44 +01:00
crashreporter	More fixes for the OSX daily builds	2018-06-21 15:22:53 +02:00
csync	Merge branch 'master' into upstream/pr/6616	2018-10-31 13:51:34 +01:00
gui	Merge branch 'master' into margins	2018-11-04 19:40:40 +01:00
libsync	Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config	2018-11-02 21:01:22 +01:00
CMakeLists.txt	Add QWebView as a dependency	2018-05-02 22:50:48 +02:00