[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-37-g693d68b

[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.05.x has been updated
       via  693d68b64746ffd5569d32f2524e3587792908a1 (commit)
      from  8e5f562ded60d6dbaed706e7ddcd0ed9e5a9343f (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 693d68b64746ffd5569d32f2524e3587792908a1
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Thu Jun 21 11:11:54 2018 -0400

    Bug 20977: Javascript vars used in confirm_deletion in catalog.js do not match strings in catalog-strings.inc
    
    The naming mismatch can cause javascript errors.
    
    Test Plan:
    1) Confirm the string vars used in catalog.js match the ones in
       catalog-strings.inc
    
    Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc |    6 +++---
 koha-tmpl/intranet-tmpl/prog/js/catalog.js                   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository