mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/cmake
History
Olivier Goffart 02704cdf74 Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
	csync/src/csync_statedb.c
	src/mirall/syncengine.cpp
	src/mirall/syncfileitem.h
2014-06-23 12:48:34 +02:00
..
modules Merge remote-tracking branch 'origin/1.6' into il 2014-06-23 12:48:34 +02:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00