mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
e9caaf36fe
urbackup_backend/urbackupserver/doc
History
Martin fd4579500d Merge branch 'next' into fileaccess 
Conflicts:
	urbackupclient/ClientService.cpp
	urbackupclient/ClientService.h
	urbackupcommon/settingslist.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/doc/admin_guide.tex
	urbackupserver/fileclient/FileClient.cpp
	urbackupserver/fileclient/FileClientChunked.cpp
	urbackupserver/server_download.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_get.h
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/www/templates.js
2014-09-13 20:15:24 +02:00
..
admin_guide.tex Merge branch 'next' into fileaccess 2014-09-13 20:15:24 +02:00