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
..
.gitignore	Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge	2010-07-05 12:17:31 +02:00
config.sample.php	Added variable $CONFIG_DBTABLEPREFIX in configuration file for table prefix	2010-07-03 18:59:56 +02:00