Jonathan Druart 52fdbd9d6b Bug 28180: Remove adlibris conflict ... Can be squashed when pushed Edit from RM before push: too many conflicts! Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>		2021-10-21 12:24:04 +02:00
..
bootstrap	Bug 28180: Remove adlibris conflict	2021-10-21 12:24:04 +02:00
lib	Bug 28180: (follow-up) Updates to styling of lightbox controls	2021-10-21 12:24:04 +02:00
xslt	Bug 26665: (bug 20168 follow-up) Fix path to bootstrap js file	2020-12-04 15:26:54 +01:00