Merge branch 'master' into dev

softwaresaved · Feb 9, 2024 · ccad16c · ccad16c
2 parents f311616 + fb08f3c
commit ccad16c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lowfat/fixtures/flatpages.json b/lowfat/fixtures/flatpages.json
@@ -110,7 +110,7 @@
     "fields": {
         "url": "/email/template/expense/claimant/",
         "title": "We received your expense claim",
-        "content": "<!DOCTYPE HTML>\r\n<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\r\n</head>\r\n<body>\r\n<p>Dear {{ expense.fund.claimant.fullname }},</p>\r\n<p>We have received your expenses claim of \u00a3{{ expense.amount_claimed }} for {{ expense.fund.title }}.</p>\r\n<p>We will process it as soon as possible and we will contact you if needed.</p>\r\n<p>You can check the status of your expense claim at <a href=\"{{ protocol }}://{{ site.domain }}{{ expense.link }}\">{{ protocol }}://{{ site.domain }}{{ expense.link }}</a>.</p>\r\n<p>\r\nBest wishes,<br>\r\nFellows Management (<a href=\"mailto:{{ FELLOWS_MANAGEMENT_EMAIL }}\">{{ FELLOWS_MANAGEMENT_EMAIL }}</a>)<br>\r\nSoftware Sustainability Institute\r\n</p>\r\n</body>\r\n</html>",
+        "content": "<!DOCTYPE HTML>\r\n<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\r\n</head>\r\n<body>\r\n<p>Dear {{ expense.fund.claimant.fullname }},</p>\r\n<p>We have received your expenses claim of \u00a3{{ expense.amount_claimed }} for {{ expense.fund.title }}.</p>\r\n<p>We will process it as soon as possible and we will contact you if needed.</p>\r\n<p>You can check the status of your expense claim at <a href=\"{{ protocol }}://{{ site.domain }}{{ expense.link }}\">{{ protocol }}://{{ site.domain }}{{ expense.link }}</a>.</p>\r\n<p>\r\n<p>To reply to this message, email <a href=\"mailto:[email protected]\">[email protected]</a></p>\r\nBest wishes,<br>\r\nFellows Management (<a href=\"mailto:{{ FELLOWS_MANAGEMENT_EMAIL }}\">{{ FELLOWS_MANAGEMENT_EMAIL }}</a>)<br>\r\nSoftware Sustainability Institute\r\n</p>\r\n</body>\r\n</html>",
         "enable_comments": false,
         "template_name": "",
         "registration_required": false,

diff --git a/requirements.txt b/requirements.txt
@@ -57,4 +57,4 @@ tablib==3.5.0
 typing_extensions==4.3.0
 urllib3==1.26.12
 xlrd==2.0.1
-xlwt==1.3.0
+xlwt==1.3.0