[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-64-gc0dd93b

[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  c0dd93b6f55fda04f6e9f0e1522e3547a0d91a48 (commit)
       via  0f29a07371dbfac0042e7540802facf997ccb864 (commit)
      from  bde65f116cb2f7467e10f771e6368ccdf41fc578 (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 c0dd93b6f55fda04f6e9f0e1522e3547a0d91a48
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 21 09:48:44 2016 +0200

    Revert "Bug 15682 - Merging records from cataloguing search only allows to merge 2 records"
    
    This reverts commit 584059a9b8947aa531ad21a04e23b5ebac6ab5a1.

commit 0f29a07371dbfac0042e7540802facf997ccb864
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 21 09:48:40 2016 +0200

    Revert "Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency)"
    
    This reverts commit bde65f116cb2f7467e10f771e6368ccdf41fc578.

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt  |   12 ++++--------
 .../prog/en/modules/virtualshelves/shelves.tt              |    6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository