]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 495f0d4 381fe4d)
Merge branch 'stable5' into ldap_oracle_fixes
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 30 Jul 2013 13:06:00 +0000 (15:06 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 30 Jul 2013 13:06:00 +0000 (15:06 +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