]> source.dussan.org Git - nextcloud-server.git/commit
Merge commit 'refs/merge-requests/18' of git://gitorious.org/owncloud/owncloud
authorFrank Karlitschek <frank@dev.(none)>
Mon, 12 Apr 2010 13:50:39 +0000 (15:50 +0200)
committerFrank Karlitschek <frank@dev.(none)>
Mon, 12 Apr 2010 13:50:39 +0000 (15:50 +0200)
commitc69eab18d25fb685705a7bc20117f2f042fe7981
tree7a307c335ef6e2be1b283612313b3774318090a2
parenta061dd3314e3bf1e9adf29b5033086c991b2cf51
parent4a1d9370fcd5fb542d8d3915658d7fa1167dfeaf
Merge commit 'refs/merge-requests/18' of git://gitorious.org/owncloud/owncloud

merge

Conflicts:
index.php
index.php