[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-7-g729906d

[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.18.x has been updated
       via  729906d747e13f39015b0d30eb5463d89e99bcfd (commit)
      from  23f46375f5e283985a22c1a74a1946052033cd70 (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 729906d747e13f39015b0d30eb5463d89e99bcfd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 18 10:51:19 2015 +0100

    Bug 13863: Fix Datatables paging on the cities and search history pages
    
    Test plan:
    Go on admin/cities.pl and catalogue/search-history.pl and confirm the
    pagination is not broken anymore.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Fixed conflict so patch applies on 3.18.x
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt             |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository