]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php

1  2 
apps/files/templates/part.list.php
apps/files_sharing/public.php

Simple merge
Simple merge