]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Fri, 11 Jan 2013 09:00:12 +0000 (10:00 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Fri, 11 Jan 2013 09:00:12 +0000 (10:00 +0100)
commit364b1cd3915ab8d33f1a63f598be3acb4bfcf86a
tree401f02cc3a6b8d9ba28620fcd9ec6a31ef381ab7
parentbfc55fef89089fc43c6a352de860374ca3fcfd53
parent60489764f37a6f344fa20e361a26c7a6006f9c97
Merge branch 'master' into fixing-998-master

Conflicts:
apps/files/js/files.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/index.php
core/js/js.js