]> 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)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 10 Sep 2021 12:06:19 +0000 (08:06 -0400)
commita23beb608813bb2bc57bf1d0adbb3c1ec47f258a
treea5c91519115cad325917b66d3a10dc94f33d8ea8
parentf73868b8ee121103e7406e26b20e9cf3ccae4eb7
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>
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt