[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.17-6-g96c08a9

[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, 3.22.x has been updated
       via  96c08a967ed4415717c075b49bf9db314229f28e (commit)
       via  68242470b96ae89452c50a69f44e53255a6a3d6c (commit)
      from  b40ab81d93e9e7bb6acd59c6cd4209358bd9ac72 (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 96c08a967ed4415717c075b49bf9db314229f28e
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date:   Thu Jan 19 00:54:24 2017 +0000

    Bug 17852 Follow up.Multiple URLs (856) in list email are broken
    
    This is a follow-up to my previous patch. This fixes it on the OPAC and
    the previous one was from the intranet
    Test Plan
    1: Add multiple urls to a biblographic record
    2: Add the biblographic record to a list and then email it from the OPAC
    3: See that the links are broken and have been merged into one.
    4: Apply patch
    5: Send the list again and see that the links work
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit e914a29788a1a85399a135d3cfd19ef9ee6f5a28)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 68242470b96ae89452c50a69f44e53255a6a3d6c
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date:   Tue Jan 17 21:37:49 2017 +0000

    Bug 17852; Multiple URLs (856) in list email are broken.
    
    Test Plan
    1: Add multiple urls to a biblographic record
    2: Add the biblographic record to a list and then email it.
    3: See that the links are broken and have been merged into one.
    4: Apply patch
    5: Send the list again and see that the links work
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit bcbd75fba2bc69b3aa26672db16d350a09d48c25)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository