]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #21543 from owncloud/Larzenegger-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 15 Jan 2016 12:29:57 +0000 (13:29 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 15 Jan 2016 12:29:57 +0000 (13:29 +0100)
[CI] Larzenegger master

1  2 
lib/private/tempmanager.php

Simple merge