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

projects / nextcloud-desktop.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6593317 318c749)

author	Michael Schuster <michael@schuster.ms>
	Sun, 1 Mar 2020 05:47:46 +0000 (06:47 +0100)
committer	Michael Schuster <michael@schuster.ms>
	Sun, 1 Mar 2020 05:47:46 +0000 (06:47 +0100)
commit	712fef0cac6def8221c42f38b89be784e4d987ec
tree	95723fc2d27c7a707bcf021d60f86ec34f2e0076	tree \| snapshot
parent	6593317afa50d6058b45a0afc501c9697a4a1db3	commit \| diff
parent	318c749558526395b25b68be5b86314e653cb010	commit \| diff

Merge branch 'master' into qml-singleton-style and fix merge conflict

Migrate changes in client.qrc to resources.qrc

Signed-off-by: Michael Schuster <michael@schuster.ms>

resources.qrc	\|	diff2 \|	blob \| history
src/gui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gui/tray/UserLine.qml	diff1 \|	diff2 \|	blob \| history
src/gui/tray/Window.qml	diff1 \|	diff2 \|	blob \| history

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