]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 890b770 1a638cd)
Merge branch 'stable5' into files_encryption_stable5
authorFlorin Peter <github@florin-peter.de>
Fri, 24 May 2013 17:40:23 +0000 (19:40 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 24 May 2013 17:40:23 +0000 (19:40 +0200)
1  2 
lib/util.php patch | diff1 | diff2 | blob | history

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