[Dolibarr-git] [Dolibarr/dolibarr] 8889e7: FIX translation of holiday types

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8889e7f4b2111b4fde4a861ce4a2fa4c9858b17c
      
https://github.com/Dolibarr/dolibarr/commit/8889e7f4b2111b4fde4a861ce4a2fa4c9858b17c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-19 (Mon, 19 Mar 2018)

  Changed paths:
    M htdocs/holiday/card.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/list.php
    M htdocs/holiday/view_log.php
    M htdocs/langs/en_US/holiday.lang

  Log Message:
  -----------
  FIX translation of holiday types


  Commit: ac9ab7b2289138c417f8c3af570feca548d165f2
      
https://github.com/Dolibarr/dolibarr/commit/ac9ab7b2289138c417f8c3af570feca548d165f2
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-19 (Mon, 19 Mar 2018)

  Changed paths:
    M htdocs/core/class/ldap.class.php

  Log Message:
  -----------
  Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0


Compare: 
https://github.com/Dolibarr/dolibarr/compare/13801a0d93c8...ac9ab7b22891