[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.01-47-g1224ec9

[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, 17.05.x has been updated
       via  1224ec9dbd1bf4a254918ddebd11a47eb0ae2ee5 (commit)
      from  ad5d72658b21b7c7fe163b411ec637300ee528c2 (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 1224ec9dbd1bf4a254918ddebd11a47eb0ae2ee5
Author: Marc Véron <veron at veron.ch>
Date:   Mon Jun 19 21:23:54 2017 +0200

    Bug 18824: Remove stray i from matching-rules.tt
    
    The file
    koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
    contains a stray i that should not be there.
    This patch removes it.
    
    Signed-off-by: Chris Kirby <chris.kirby at ilsleypubliclibrary.org>
    Applied patch.
    Checked line 516. Stray i had been removed.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ce176fd170227456fa725e5f1f2f6b1b04fd044d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository