[Pkg-owncloud-commits] [owncloud] 19/74: Merge pull request #12154 from owncloud/ignore-port-for-trusted-domain

[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 0271e7539d49b58f38237f363f83b8cc8405cdd3
Merge: 74a6251 3acd98f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Nov 18 10:53:22 2014 +0100

    Merge pull request #12154 from owncloud/ignore-port-for-trusted-domain
    
    Ignore port for trusted domains

 config/config.sample.php    |  2 +-
 lib/base.php                |  8 +------
 lib/private/repair.php      |  3 ++-
 lib/private/request.php     | 17 ++++++++++++--
 lib/repair/repairconfig.php | 54 +++++++++++++++++++++++++++++++++++++++++++++
 tests/lib/request.php       |  8 +++++--
 6 files changed, 79 insertions(+), 13 deletions(-)

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