]> source.dussan.org Git - nextcloud-server.git/commit
Merge git://gitorious.org/owncloud/owncloud
authorSimon Birnbach <simon@simon-birnbach.de>
Sun, 15 Apr 2012 13:59:57 +0000 (15:59 +0200)
committerSimon Birnbach <simon@simon-birnbach.de>
Sun, 15 Apr 2012 13:59:57 +0000 (15:59 +0200)
commita384fcb99fc3a12d7dac937398bf827c79e86098
tree55a631751578cd1f642e5fa0f88fd2290509b126
parent4e89a0faf652f2f100cca47cca54a3b35e720aad
parent38cb716a572a8af136f6260089bc486413c6ca9f
Merge git://gitorious.org/owncloud/owncloud

Conflicts:
files/css/files.css
files/js/files.js
files/css/files.css
files/index.php
files/js/fileactions.js
files/js/filelist.js
files/js/files.js
files/templates/index.php
files/templates/part.list.php