[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.14-5-g41213f62d4

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 18.11.x has been updated
       via  41213f62d4e4b9940ef5a0e808dd4299124379a5 (commit)
      from  a230878b6f3d3afa5d7f33c9d816bd6272c5b1a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 41213f62d4e4b9940ef5a0e808dd4299124379a5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Mar 16 16:56:13 2020 +0100

    Bug 21296: [18.11.x] Fix wrong resolution conflict
    
    On
      commit a230878b6f3d3afa5d7f33c9d816bd6272c5b1a1
      Bug 21296: suspend hold ignores system preference on intranet
    
    See comment 10.
    
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository