]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into display-share-owner-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Feb 2014 13:54:10 +0000 (14:54 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Feb 2014 13:54:10 +0000 (14:54 +0100)
commit15d1df055b093ecce0c5ae52561dd73584145c7c
tree4f2b10bacfa5371e3f2a53122a3165bf94114d01
parent65843e245996c9ecfd167be2b520bb917b32aa7e
parentdd32091016481b0b6845e03ea87ce419b3cda19e
Merge branch 'master' into display-share-owner-master

Conflicts:
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/cache.php