]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12785b9 0e19704)
Merge pull request #2992 from FlorinPeter/files_encryption
authorFlorinPeter <github@florin-peter.de>
Sat, 20 Apr 2013 12:35:29 +0000 (05:35 -0700)
committerFlorinPeter <github@florin-peter.de>
Sat, 20 Apr 2013 12:35:29 +0000 (05:35 -0700)
fix for trashbin

1  2 
apps/files_encryption/lib/proxy.php patch | diff1 | diff2 | blob | history

diff --cc apps/files_encryption/lib/proxy.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server