Bug 7143 - Updating history and about page

First commit from Silvia Simonetti, went into the 3.12.x branch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 224d878cf76813c5f8f229031ef916f1f73fd975)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 7b5141e9501550918741b02b55f1b49706240f7b)

diff --git a/docs/history.txt b/docs/history.txt
index 1c0453e..83948fa 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -678,3 +678,4 @@ May 24 2013 Connor Fraser becomes the 212th developer to have a patch pushed
 June 23 2013   Koha 3.12.1 released    releases
 June 23 2013   Koha 3.10.7 released    releases
 June 23 2013   Koha 3.8.14 released    releases
+July 7 2013    Silvia Simonetti becomes the 213th developer to have a patch pushed

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index fc61a9d..ae390ad 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -272,6 +272,7 @@
                 <li>John Seymour</li>
                 <li>Juan Romay Sieira</li>
                 <li>Zach Sim</li>
+                <li>Silvia Simonetti</li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Fridolyn Somers</li>