From: Paul Poulain Date: Fri, 6 Apr 2012 13:12:28 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/new/bug_7143' X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=413a1e1e61b343db47b9b6fdecf3d981d87013ef;hp=-c;p=koha.git Merge remote-tracking branch 'origin/new/bug_7143' --- 413a1e1e61b343db47b9b6fdecf3d981d87013ef diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 302e7bd2d7,736ecf0b27..d908f2caf5 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@@ -10,7 -10,7 +10,7 @@@ //]]> - + [% INCLUDE 'header.inc' %] @@@ -137,7 -137,6 +137,7 @@@
  • John Beppu
  • David Birmingham
  • Florian Bischof
    • +
  • Gaetan Boisson
  • Danny Bouman
  • Stan Brinkerhoff
  • Roger Buck
    • @@@ -152,7 -151,6 +152,7 @@@
  • Jerome Charaoui
  • Andrew Chilton
  • Garry Collum
    • +
  • David Cook
  • John Copeland
  • Jeremy Crabtree
  • Christophe Croullebois
    • @@@ -372,7 -370,7 +372,7 @@@
  • Norsk Nynorsk (Norwegian) Unni Knutsen and Marit Kristine Ådland
  • ArmenianTigran Zargaryan
  • (Indonesian)
    • -
  • Italiano (Italian) Zeno Tajoli, Pietro Gozzetti and Paolo Pozzan
    • +
  • Italiano (Italian) for 3.2: Zeno Tajoli, Pietro Gozzetti and Paolo Pozzan; for 3.4 and more: Zeno Tajoli, Stefano Bargioni, Paolo Bizzarri
  • 日本語 (Japanese)
  • 한국어 (Korean)
  • ಕನ್ನಡ (kannaḍa)