nextcloud-desktop/admin
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
..
osx Revert "Remove references to qsqlite3" 2014-10-20 10:27:34 +02:00
win [tx-robot] updated from transifex 2014-10-22 02:06:40 -04:00
CMakeLists.txt Create Mac Pack: Copy the creator script to the build directory. 2014-08-26 18:13:43 +02:00