mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/cmake
History
Olivier Goffart 81d786733d Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
	src/mirall/propagator_qnam.cpp
	src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
..
modules Merge remote-tracking branch 'origin/1.6' into il 2014-07-18 16:59:29 +02:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00