[koha-commits] main Koha release repository annotated tag unilim_maj_111221 created. unilim_maj_111221

[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 annotated tag, unilim_maj_111221 has been created
        at  4edf283f1d57674cd4caabef181489dde9a24ed5 (tag)
   tagging  58d12b6172e0a3ee448969ca6d490e743a57dac7 (commit)
  replaces  unilim_maj_111214
 tagged by  Claire Hernandez
        on  Wed Dec 21 10:19:38 2011 +0100

- Log -----------------------------------------------------------------
Livraison hebdomadaire pré-production Scd-Limoges 21/12/2011

$ git sb origin/dev/unilim unilim_maj_111214
! [origin/dev/unilim] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
 ! [unilim_maj_111214] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
--
-  [58d12b6] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
+  [347b4a6] MT8266: Fix issue confirmation message when user has overdues
+  [23cadac] MT5546: Fix JSON keys to prevent translation of them
-- [aa3bc5d] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Templates modifiés depuis la semaine dernière:

koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/orders.tmpl

Claire Hernandez (1):
      Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Julian Maurice (2):
      MT5546: Fix JSON keys to prevent translation of them
      Merge remote-tracking branch 'origin/stetienne/ft/MT5546' into dev/stetienne

Matthias Meusburger (1):
      MT8266: Fix issue confirmation message when user has overdues

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


hooks/post-receive
-- 
main Koha release repository