]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e170a3c) | patch
Bug 35329: Fix conflict with 33457
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 1 Mar 2024 15:01:13 +0000 (16:01 +0100)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 1 Mar 2024 15:04:27 +0000 (16:04 +0100)
commit36c4d315c8b4bac116377d7fac4d9e51414c7f80
tree26b68af3f9f205397ee1abda67312615e1bac1f6tree | snapshot
parente170a3c2ab6b2c3dfc9ed34ce802807c97e95885commit | diff
Bug 35329: Fix conflict with 33457

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt diff | blob | history
Main Koha release repository