]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
authorLukas Reschke <lukas@owncloud.com>
Wed, 3 Sep 2014 09:04:49 +0000 (11:04 +0200)
committerLukas Reschke <lukas@owncloud.com>
Wed, 3 Sep 2014 09:04:49 +0000 (11:04 +0200)

Trivial merge