]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <developer@georgehrke.com>
Mon, 5 Aug 2013 12:27:38 +0000 (14:27 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Mon, 5 Aug 2013 12:27:38 +0000 (14:27 +0200)
commitaf983b843d1335917f4a702cea6d91d28bab68e9
tree692e6e4090ef282b597b9b69d2abd53262cf47a0
parent554b1990e23c76aea182e9b8c2687f8f8b939fb9
parent0fce89308e2fbcb44a2091ca67f373ba89ee068e
fix merge conflicts
apps/files_sharing/public.php
apps/files_trashbin/lib/trash.php
apps/files_trashbin/templates/part.list.php
config/config.sample.php