Bug 15774: (follow-up) fix rebase issues
authorNick Clemens <nick@bywatersolutions.com>
Wed, 27 Feb 2019 18:22:31 +0000 (13:22 -0500)
committerNick Clemens <nick@bywatersolutions.com>
Thu, 7 Mar 2019 20:37:06 +0000 (20:37 +0000)
commit1966c6be2e21613c5e1efb977dc946f0f1c21e20
treedffde4ccbc3e3c8af228c268571bfa4fd9539b62
parent9cfcd21f24c176cecb743084ee22243aeb44848d
Bug 15774: (follow-up) fix rebase issues

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
serials/serials-search.pl