[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-126-gaafa086

[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, 18.05.x has been updated
       via  aafa08631a8a4e19dc38c58a682319df1cc38c11 (commit)
      from  64c1c84fe6e9236596966a689f65f33f804e6186 (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 aafa08631a8a4e19dc38c58a682319df1cc38c11
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Fri Nov 16 15:24:57 2018 +0000

    Bug 21777: (RMaint follow-up) Fix for bad merge conflict
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 t/db_dependent/selenium/regressions.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository