[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.00-2-gbade83a

[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.20.x has been updated
       via  bade83ae7bc38b83620e95507501ba997fc70fae (commit)
       via  8a94a1af3f696284ada862244ad425411be48df9 (commit)
      from  22a6d3fe2ef8f4aad8b689c577bf347954301481 (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 bade83ae7bc38b83620e95507501ba997fc70fae
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 4 22:08:04 2015 +0200

    Bug 14130: Update columns.def
    
    - Updates columns.def with new columns in items
    - Adds some descriptions
    - Corrects some existing column descrpitions
    
    To test:
    - Read the patch to see what has been changed
    - Run the guided report builder for the 'circulation'
      module
    - Observe changes show up
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Changes show up, no errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit cc4aaf891bdda0d94157c32a99c2a2acace41498)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8a94a1af3f696284ada862244ad425411be48df9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri May 22 17:01:57 2015 -0300

    (RM followup) .mailmap updates
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 5d5802dd70a88fa42dc065bcfc4c0cc58377fff6)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .mailmap                                    |    5 +++--
 koha-tmpl/intranet-tmpl/prog/en/columns.def |   14 ++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository