From 0595fee148a70110307d743b7ea696ef87a35ff6 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Tue, 14 Mar 2017 11:25:24 -0300
Subject: [PATCH] Bug 7143: Add Patricio Marrone to history.txt

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 docs/history.txt                                 | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/history.txt b/docs/history.txt
index 5f6e5c7479..e369dbfd86 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -900,3 +900,4 @@ December 23 2016	Tim McMahon becomes the 309th developer to have a patch pushed
 December 23 2016	Dani Elder becomes the 310th developer to have a patch pushed	developer
 January 2 2017	Koha 3.22.14 released	releases
 January 3 2017	Koha 16.05.07 released	releases
+January 13 2017    Patricio Marrone becomes the 311th developer to have a patch pushed   developer
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index b3c43a3bd5..40aa5052d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -555,6 +555,7 @@
                 <li>Robert Lyon (Corporate Serials)</li>
                 <li>Merllisia Manueli</li>
                 <li>Francois Marier</li>
+                <li>Patricio Marrone</li>
                 <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
-- 
2.39.5