[X2Go-Commits] [pale-moon] 20/102: Merge pull request #931 from Ascrod/master

[git-admin at x2go.org]

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

x2go pushed a commit to branch upstream/28.4.0
in repository pale-moon.

commit 01ad6e7451f20f819e4ae3b10c981cc52b65b63d
Merge: f6ef8d8 a74b093
Author: Moonchild <mcwerewolf at wolfbeast.com>
Date:   Fri Jan 18 05:28:19 2019 +0100

    Merge pull request #931 from Ascrod/master
    
    Fix option for disabling HSTS in Pale Moon

 .../palemoon/components/preferences/security.xul   |  6 +++---
 modules/libpref/init/all.js                        |  2 ++
 security/manager/ssl/nsSiteSecurityService.cpp     | 24 ++++++++++++++++++++++
 security/manager/ssl/nsSiteSecurityService.h       |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git