mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-30 08:20:27 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/cmake
History
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
..
modules Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
scripts