server/config/.gitignore
Robin Appelman a73fbc5e32 Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge
Conflicts:
	inc/HTTP/WebDAV/Server/Filesystem.php
	inc/lib_config.php
	inc/lib_log.php
	inc/lib_user.php
	inc/templates/adminform.php
2010-07-05 12:17:31 +02:00

2 lines
26 B
Text
Executable file