]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-js-errors-public-link-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Thu, 31 Jan 2013 22:23:10 +0000 (23:23 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Thu, 31 Jan 2013 22:23:10 +0000 (23:23 +0100)
commit2af6d74bc1bfb8b3ade363c6e8fbdc1b25a42af2
tree22b375aec0d4668be834565ed6f2552cf90244f2
parent11e88f49391a4a38145670f731d20a1fa66040d4
parent317261d6dfa2b95234628c6e6649bcb94999552a
Merge branch 'master' into fixing-js-errors-public-link-master

Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
apps/files/templates/part.list.php
apps/files_sharing/public.php