git://gitorious.org/owncloud/owncloud into merge
Robin Appelman
authored
Conflicts: inc/HTTP/WebDAV/Server/Filesystem.php inc/lib_config.php inc/lib_log.php inc/lib_user.php inc/templates/adminform.php
| Name | Last commit | Last update |
|---|---|---|
| .. | ||
| .gitignore | ||
| config.sample.php | ||