source.dussan.org Git - nextcloud-server.git/commit

]> source.dussan.org Git - nextcloud-server.git/commit

projects / nextcloud-server.git / commit

author	Robin Appelman <icewind1991@gmail.com>
	Mon, 5 Jul 2010 10:17:31 +0000 (12:17 +0200)
committer	Robin Appelman <icewind1991@gmail.com>
	Mon, 5 Jul 2010 10:17:31 +0000 (12:17 +0200)
commit	a73fbc5e32546bc693fbc45486c8c96d8f6757be
tree	57fa05d59fb2ddf3c4ee951c79e44eba1a9a37ff	tree \| snapshot
parent	845d53414482686548ab2435d738b0b3afcd47c3	commit \| diff
parent	76672fe0379acfd26ac5b85c4c99040c9cb2554e	commit \| diff

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

.gitignore	diff1 \|	diff2 \|	blob \| history
config/.gitignore	diff1 \|	diff2 \|	blob \| history
css/small.php	diff1 \|	diff2 \|	blob \| history
inc/HTTP/WebDAV/Server/Filesystem.php	diff1 \|	diff2 \|	blob \| history
inc/lib_config.php	diff1 \|	diff2 \|	blob \| history
inc/lib_log.php	diff1 \|	diff2 \|	blob \| history
inc/lib_user.php	diff1 \|	diff2 \|	blob \| history
inc/templates/adminform.php	diff1 \|	diff2 \|	blob \| history

Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
config/.gitignore	diff1 \|	diff2 \|	blob \| history
css/small.php	diff1 \|	diff2 \|	blob \| history
inc/HTTP/WebDAV/Server/Filesystem.php	diff1 \|	diff2 \|	blob \| history
inc/lib_config.php	diff1 \|	diff2 \|	blob \| history
inc/lib_log.php	diff1 \|	diff2 \|	blob \| history
inc/lib_user.php	diff1 \|	diff2 \|	blob \| history
inc/templates/adminform.php	diff1 \|	diff2 \|	blob \| history