[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.12-11-g2033a297cb

[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, 19.05.x has been updated
       via  2033a297cb49f06ef5cc262854307edea99e71ab (commit)
      from  ecc3d1957fa979dec98f518921f0895a6adb84ac (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 2033a297cb49f06ef5cc262854307edea99e71ab
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Wed May 6 16:22:57 2020 -0400

    Bug 25394: Cronjob path in the AuthorityMergeLimit syspref description is wrong
    
    Test plan:
    1- Apply patch
    2- Go to Administration > Global system preferences > Authorities
    3- The path to merge_authorities.pl in the AuthorityMergeLimit
    description should now read misc/cronjobs/merge_authorities.pl
    
    Signed-off-by: David Nind <david at davidnind.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 772205bab5c7d6720ca6d25244c04cdf7649a96f)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 8deb5f874ef719db04f37e9741e88fd6ba200515)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit b10e9ce6ab675067d8b78600ebe86d2a4735deb4)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository