[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.15-18-gef79c94ebd

[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  ef79c94ebd87813e5786c77b64793e8ff6fe40ff (commit)
      from  88b0ba01e94f95efaedd74808a7833d1d1a58632 (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 ef79c94ebd87813e5786c77b64793e8ff6fe40ff
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Mar 4 18:29:24 2020 +0000

    Bug 24798: smart-rules.tt has erroneous comments
    
    This patch corrects a couple of invalid Template Toolkit comments in the
    Circulation and Fines rules template.
    
    To test, apply the patch and log into the staff client as an
    administrator.
    
    On the Circulation and Fines Rules page "View source" and look for
    instances of the text "[#% Default branch %#]" There should be none.
    
    Signed-off-by: David Nind <david at davidnind.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    [EDIT] There is a theoretical difference between [% # and [%#. The latter
    marks the whole directive as a comment and not just until EOL.
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 1fbd4468642aa09b999b3baf014b6f3a0afd6df8)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit b791fabc939ace33aa915d3ae6e2480ce2901581)
    
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository