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 f0e29fc46fbc9c6dad7bdd360a067696c930d4cc (commit)
via 4c45a5011ba815d1b13746a5c9192dfc51091dc7 (commit)
from fad518ed7de058937177c59fbc24f0fbcf30fe67 (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 f0e29fc46fbc9c6dad7bdd360a067696c930d4cc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 15 15:20:16 2018 -0300
Bug 19641: (follow-up) Update circulation.tt too
Fix bad merge conflict with bug 18403
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4c45a5011ba815d1b13746a5c9192dfc51091dc7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 15 15:09:35 2018 -0300
Bug 19641: (follow-up) Move patron templates to the footer
Fix bad merge conflict with bug 12904
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 4 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt | 4 ++--
17 files changed, 20 insertions(+), 20 deletions(-)
hooks/post-receive
--
main Koha release repository