From 487dbefe68ebb5fd20e2f8def39dede211d8f7f9 Mon Sep 17 00:00:00 2001
From: dianaboiangiu <boiangiudiana58@gmail.com>
Date: Wed, 29 Jul 2020 13:31:28 +0300
Subject: [PATCH] Release 2.2.12

---
 CHANGELOG.md                | 7 +++++++
 insitu/templates/about.html | 9 +++++++++
 insitu/templates/home.html  | 5 ++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1286295..0f195957 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,17 @@ Changelog
 
 * In case of major changes, an email should be sent to all users with the modifications.
 
+
+2.2.12 (2020-07-29)
+-------------------
+* Fix email sender in password reset
+  [dianaboiangiu]
+
 2.2.11 (2020-06-26)
 -------------------
 * Fix Entrusted Entity per Component statistics Report - The requirements were counted multiple times if they appeared in 2 or more products - this is now fixed
 * Fix product-requirement link Report - include requirements which do not have a link to data
+  [dianaboiangiu]
 
 2.2.10 (2020-06-05)
 -------------------
diff --git a/insitu/templates/about.html b/insitu/templates/about.html
index 8f1e33e3..fb2c0d7e 100644
--- a/insitu/templates/about.html
+++ b/insitu/templates/about.html
@@ -60,6 +60,15 @@ <h3><b>&emsp;Changelog</b></h3>
 
       <tbody>
 
+        <tr>
+          <td>
+            <h4 class="font-weight-bold">2.2.12 (2020-07-29)</h4>
+            <ul>
+              <li>Fix email sender in password reset</li>
+            </ul>
+          </td>
+        </tr>
+
         <tr>
           <td>
             <h4 class="font-weight-bold">2.2.11 (2020-06-26)</h4>
diff --git a/insitu/templates/home.html b/insitu/templates/home.html
index 12453640..4e96d3c7 100644
--- a/insitu/templates/home.html
+++ b/insitu/templates/home.html
@@ -37,10 +37,9 @@ <h1>In Situ Component</h1>
         <div class="latest-information">
           <div>
             <p class="latest-changes-text">Latest changes</p>
-            <h4 class="font-weight-bold">2.2.11 (2020-06-26)</h4>
+            <h4 class="font-weight-bold">2.2.12 (2020-07-29)</h4>
             <ul>
-              <li>Fix Entrusted Entity per Component statistics Report - The requirements were counted multiple times if they appeared in 2 or more products - this is now fixed</li>
-              <li>Fix Product-Requirement link Report - include requirements which do not have a link to data</li>
+              <li>Fix email sender in password reset</li>
             </ul>
             <p><strong>The UserManual is available <a href="{% url 'user_manual' %}">here.</strong></a></p>
             {% if DEBUG %}