[Pkg-owncloud-commits] [owncloud] 21/134: Merge pull request #7565 from owncloud/stable6-trusteddomainerrorpage

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit eaf96335adf15bd342a67ab5b17c9ac9b720a5b7
Merge: 6b45835 d7163c9
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Wed Mar 5 21:04:11 2014 +0100

    Merge pull request #7565 from owncloud/stable6-trusteddomainerrorpage
    
    [stable6] Show warning page when accessing server from an untrusted domain

 lib/base.php            |  16 ++++++
 lib/private/request.php |  78 +++++++++++++++++++++------
 tests/lib/request.php   | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 214 insertions(+), 17 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git