[koha-commits] main Koha release repository branch master updated. v18.05.00-1167-ga05c1cb

[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  a05c1cb9a60ea40a6b2716a16136ca92488a979f (commit)
      from  89bad1fa460dc75bdaeb40e82ee56639e35fe0c9 (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 a05c1cb9a60ea40a6b2716a16136ca92488a979f
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Oct 26 19:43:20 2018 +0000

    Bug 21526: (RM follow-up) Fix merge markers and a few extra filters
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt        |    8 +-------
 .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt    |    4 ++--
 .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt      |    6 +++---
 4 files changed, 8 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository