dgit.raspbian.org Git - nextcloud-desktop.git/commit

projects / nextcloud-desktop.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: de9ea19 a139d1a)

author	ckamm <mail@ckamm.de>
	Tue, 6 Dec 2016 09:55:58 +0000 (10:55 +0100)
committer	GitHub <noreply@github.com>
	Tue, 6 Dec 2016 09:55:58 +0000 (10:55 +0100)
commit	5bef1aa402d600c658ddbdb0efde819bfc178516
tree	ab873d4276873f2690a417ceb0ef1a2fac3c1660	tree \| snapshot
parent	de9ea19e7e49ae2ddfe94114ad8b55f66f154c20	commit \| diff
parent	a139d1a2799c125f2ffe435338e705a7416cd33b	commit \| diff

Merge pull request #5045 from owncloud/dbjournal_per_account

Allow a folder to be synced to several accounts. This changes the path of the sync journal file!

src/cmd/cmd.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/accountsettings.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/folder.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/folderman.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/folderman.h	diff1 \|	diff2 \|	blob \| history
src/gui/owncloudsetupwizard.cpp	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.