[koha-commits] main Koha release repository branch master updated. v17.05.00-894-g42c6347

[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, master has been updated
       via  42c634745cac4fc33a53bc1312a3e143a2e0ffbc (commit)
      from  c63d560b041ab67bafc65a6f9e65eee9e43c2a1a (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 42c634745cac4fc33a53bc1312a3e143a2e0ffbc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Oct 23 16:59:11 2017 -0300

    Bug 12768: Fix bad merge resolution conflict
    
    RM note:
    I have applied
    https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68427
    on top of other patches that were already pushed.
    But it was supposed to replace them, this change revert what was in
    https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68417
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Accounts.pm |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository