[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.04-5-g5c75c0a

[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  5c75c0a4d7eb23805fe091bfe3b0a66f5eb5007c (commit)
       via  231657a7cf4ad315a9aff84f4836c305f4cd3055 (commit)
      from  6709813a022de5e2cc53730e0299259ed9dc53bd (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 5c75c0a4d7eb23805fe091bfe3b0a66f5eb5007c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 24 17:07:05 2015 +0100

    Bug 14884: Adjust the number of tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 231657a7cf4ad315a9aff84f4836c305f4cd3055
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 24 14:20:33 2015 +1200

    Bug 14884: remove spurious conflict markers
    
    To test:
    * Run t/00-merge-conflict-markers.t, ensure it passes
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 t/db_dependent/Circulation.t |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository