[X2Go-Commits] [pale-moon] 249/294: Merge branch 'master' into Sync-weave

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.5.0 in repository pale-moon. commit 8e5056ce2fa45726c5498c04808b7b4b9ee107e0 Merge: dc4c5d4 7d1126f Author: Matt A. Tobin <email@mattatobin.com> Date: Sat Apr 13 05:41:07 2019 -0400 Merge branch 'master' into Sync-weave application/palemoon/app/blocklist.xml | 7 +++++- docs/CODE_OF_CONDUCT.md | 42 ++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 11 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git