]> git.koha-community.org Git - koha.git/commit
Bug 28912: Remove duplicated warnings on the about page
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 27 Aug 2021 14:59:43 +0000 (16:59 +0200)
committerFridolin Somers <fridolin.somers@biblibre.com>
Thu, 16 Sep 2021 07:47:39 +0000 (21:47 -1000)
commit5b1bba3cb51eea07a2ba430a025f2f5fd9409ceb
treee1ac365fd53fc0cecd3640b19fc718f056715130
parentb0c1bfc0ab83c5a602d7c24a421be3567eefd19b
Bug 28912: Remove duplicated warnings on the about page

Bad conflict resolution

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a23beb608813bb2bc57bf1d0adbb3c1ec47f258a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt