Christian Kamm afec3ccf6e Conflicts: Change tags to be more user friendly #6365 ... From "_conflict-user-yyyymmdd-hhmmss" to " (conflicted copy user yyyy-mm-dd hhmmss)"		2018-04-03 14:03:03 +02:00
..
3rdparty	libcrashreporter-qt: Update submodule	2018-02-07 15:31:42 +01:00
cmd	owncloudcmd: Do not overwrite the http timeout for json jobs	2018-02-26 16:11:46 +01:00
common	Conflicts: Change tags to be more user friendly #6365	2018-04-03 14:03:03 +02:00
crashreporter	Apply branding to crashreporter resources file	2018-03-16 16:59:01 +01:00
csync	csync_update: add the checksum in the discovery log	2018-03-28 13:42:54 +02:00
gui	FolderStatusModel: fix potential assert	2018-03-28 10:19:05 +02:00
libsync	Rename local discovery option for clarity	2018-03-28 11:25:32 +02:00
CMakeLists.txt	Revert "Disable stack protection for mingw win32 builds in 2.4"	2018-01-14 14:39:29 +01:00