]> 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)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 9 Sep 2021 08:59:38 +0000 (10:59 +0200)
commit95ff094030344e22b43ebf73a6a8184bea18c26f
treee783e1e8d1292d2ab9e4c3e19552a173035e7057
parentac9dff5509448d733026ee4b7f8dde8b1a6b9394
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>
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt