[koha-commits] main Koha release repository branch master updated. v3.08.00-1046-gb48615d

[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  b48615dda50342ab7a50efdac4d5177d9657f266 (commit)
       via  b83050efab9e4a3b4f2ed8ad8d29311c6d5d0cd9 (commit)
       via  8ec52a8e23695f2277aaae4a9d216ea8fb079064 (commit)
       via  16a0975f313748aea48abf067a297638d0ccabe0 (commit)
       via  80f8c46dc6157d2fcad9afa30fd648419bb10893 (commit)
      from  782e1845f3c77f68fe144df91c88b894aecb9607 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 cataloguing/merge.pl                               |  129 ++++++++++----------
 .../prog/en/modules/cataloguing/merge.tt           |   32 ++++--
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |   40 +++----
 .../prog/en/xslt/NORMARCslim2intranetResults.xsl   |   24 ++--
 .../prog/img/famfamfam/GR.png}                     |  Bin 606 -> 606 bytes
 .../prog/img/famfamfam/TD.png}                     |  Bin 452 -> 452 bytes
 .../lib/famfamfam/{silk/picture.png => GR.png}     |  Bin 606 -> 606 bytes
 .../prog/img => opac-tmpl/lib}/famfamfam/PR.png    |  Bin 385 -> 385 bytes
 .../lib/famfamfam/{silk/brick.png => TD.png}       |  Bin 452 -> 452 bytes
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    1 -
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |   40 +++----
 .../prog/en/xslt/NORMARCslim2OPACResults.xsl       |   27 ++--
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    4 +-
 13 files changed, 145 insertions(+), 152 deletions(-)
 copy koha-tmpl/{opac-tmpl/lib/famfamfam/silk/picture.png => intranet-tmpl/prog/img/famfamfam/GR.png} (100%)
 copy koha-tmpl/{opac-tmpl/lib/famfamfam/silk/brick.png => intranet-tmpl/prog/img/famfamfam/TD.png} (100%)
 copy koha-tmpl/opac-tmpl/lib/famfamfam/{silk/picture.png => GR.png} (100%)
 copy koha-tmpl/{intranet-tmpl/prog/img => opac-tmpl/lib}/famfamfam/PR.png (100%)
 copy koha-tmpl/opac-tmpl/lib/famfamfam/{silk/brick.png => TD.png} (100%)


hooks/post-receive
-- 
main Koha release repository