Bug 7143: Updating history and about page
authorChris Cormack <chris@bigballofwax.co.nz>
Sun, 7 Jul 2013 08:38:55 +0000 (20:38 +1200)
committerBernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Sun, 4 Aug 2013 20:39:29 +0000 (17:39 -0300)
commitb219fa7f21a469e4204b37dcd862694561c44fe9
tree5c3e54118f7e465d83130b17129b9611aecdf487
parentf3611a8030983e70a154e7b60ba418bae65f0af1
Bug 7143: Updating history and about page

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d647090a4ab9b53577c1959dcdb0642a29fcbe6d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)

Conflicts:

docs/history.txt

Solved minor conflicts

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)
docs/history.txt
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt