]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2640229) | patch
Bug 19287: Fix conflict with bug 19974
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 9 Apr 2018 15:59:26 +0000 (12:59 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 23 Apr 2018 15:42:38 +0000 (12:42 -0300)
commit406c642dfaf5da77ae04d8f4dc38d95539fec235
treea09d4738dadd30a513dc68fb0c42609e09eaad7ctree | snapshot
parent26402293614301a273300bd8afd6afa2c55640b5commit | diff
Bug 19287: Fix conflict with bug 19974

Note that these patches should be pushed along with bug 19984 to avoid
regressions (if the syspref is changed between the 2 update DB entries)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
circ/pendingreserves.pl diff | blob | history
installer/data/mysql/atomicupdate/bug_19287.sql diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref diff | blob | history
Main Koha release repository