Bug 7143: Adding new developers to the history file

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>

diff --git a/docs/history.txt b/docs/history.txt
index eb06f03..e3a4c01 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -628,4 +628,10 @@ July 7 2012        Stacey Walker becomes the 187th developer to have a patch pushed
 July 7 2012    Mirko Tietgen becomes the 188th developer to have a patch pushed
 July 22 2012   Koha 3.8.3 released     releases
 July 22 2012   Koha 3.6.7 released     releases
-September 3 2012    Kathryn Tyree becomes the 189th developer to have a patch pushed
+August 22 2012 Koha 3.8.4 released     releases
+August 22 2012 Koha 3.6.8 released     releases
+September 3 2012       Kathryn Tyree becomes the 189th developer to have a patch pushed
+September 11 2012      Melia Meggs becomes the 190th developer to have a patch pushed
+September 20 2012      Joseph Alway beomes the 191st developer to have a patch pushed
+September 22 2012      Koha 3.8.5 released     releases
+September 22 2012      Koha 3.6.8 released     releases
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 32d87c5..315844b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -160,6 +160,7 @@
                 <li>Jon Aker</li>
                 <li>Edward Allen</li>
                 <li>Francisco M. Marzoa Alonso</li>
+               <li>Joseph Alway</li>
                 <li>Cindy Murdock Ames</li>
                 <li>Richard Anderson</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
@@ -268,6 +269,7 @@
                 <li>Brig C. McCoy</li>
                 <li>Dorian Meid (German translation)</li>
                 <li>Meenakshi. R</li>
+               <li>Melia Meggs</li>
                 <li>Matthias Meusburger</li>
                 <li>Sophie Meynieux</li>
                 <li>Alan Millar</li>