From 08bf354284e69b5e290909e3ce701f90d9acf984 Mon Sep 17 00:00:00 2001
From: Michiel Dethmers <michiel@phplist.com>
Date: Wed, 15 Jan 2025 15:58:40 +0000
Subject: [PATCH 1/2] update PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 00f5e4a22..b6b22489e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,23 @@
-<!---Thanks for contributing to phpList!-->
+<!--- Thanks for contributing to phpList!-->
 
 ## Description
 <!--- Please provide a general description of your changes in the Pull Request -->
 
+## Contributor License Agreement
+ 
+<!-- 
+
+before we can accept your PR, if you haven't done this yet, please sign the 
+
+Contributor License Agreement at https://www.phplist.com/cla
+
+Many thanks
+
+the phpList Team
+
+-->
+
+
 ## Related Issue
 
 

From 008db6920fe2cabb78cceda9619c874e38aea7df Mon Sep 17 00:00:00 2001
From: Duncan Cameron <3147688+bramley@users.noreply.github.com>
Date: Wed, 22 Jan 2025 13:57:20 +0000
Subject: [PATCH 2/2] Remove POP3 from error message

---
 public_html/lists/admin/processbounces.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/lists/admin/processbounces.php b/public_html/lists/admin/processbounces.php
index 39fbdcdfa..edb5597d2 100644
--- a/public_html/lists/admin/processbounces.php
+++ b/public_html/lists/admin/processbounces.php
@@ -376,7 +376,7 @@ function processPop($server, $user, $password)
         $link = imap_open($mailbox, $user, $password);
 
         if (!$link) {
-            outputProcessBounce($GLOBALS['I18N']->get('Cannot create POP3 connection to')." $mailbox: ".imap_last_error());
+            outputProcessBounce($GLOBALS['I18N']->get('Cannot create connection to')." $mailbox: ".imap_last_error());
 
             return false;
         }