Jonathan Druart 95ff094030 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>		2021-09-09 10:59:38 +02:00
..
intranet-tmpl	Bug 28912: Remove duplicated warnings on the about page	2021-09-09 10:59:38 +02:00
opac-tmpl	Bug 26302: (QA follow-up) Prefix prefs with OPAC	2021-08-30 17:04:31 +02:00