diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2010-07-05 12:17:31 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2010-07-05 12:17:31 +0200 |
| commit | a73fbc5e32546bc693fbc45486c8c96d8f6757be (patch) | |
| tree | 57fa05d59fb2ddf3c4ee951c79e44eba1a9a37ff /.gitignore | |
| parent | 845d53414482686548ab2435d738b0b3afcd47c3 (diff) | |
| parent | 76672fe0379acfd26ac5b85c4c99040c9cb2554e (diff) | |
| download | nextcloud-server-a73fbc5e32546bc693fbc45486c8c96d8f6757be.tar.gz nextcloud-server-a73fbc5e32546bc693fbc45486c8c96d8f6757be.zip | |
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
Diffstat (limited to '.gitignore')
| -rwxr-xr-x[-rw-r--r--] | .gitignore | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 71e3ec1baf9..71e3ec1baf9 100644..100755 --- a/.gitignore +++ b/.gitignore |