nextcloud-desktop/cmake
Markus Goetz f004d5085d Merge remote-tracking branch 'origin/1.6' into il
Conflicts:
	VERSION.cmake
2014-07-25 12:37:27 +02:00
..
modules Merge remote-tracking branch 'origin/1.6' into il 2014-07-25 12:37:27 +02:00
scripts Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00