Skip to content
Snippets Groups Projects
  1. Aug 05, 2013
  2. Aug 03, 2013
    • Laurent Destailleur's avatar
      Merge remote-tracking branch 'origin/3.4' into develop · 447d0063
      Laurent Destailleur authored
      Conflicts:
      	htdocs/langs/ca_ES/withdrawals.lang
      	htdocs/langs/es_ES/withdrawals.lang
      	htdocs/langs/fr_FR/withdrawals.lang
      	htdocs/langs/ja_JP/compta.lang
      	htdocs/langs/ja_JP/contracts.lang
      	htdocs/langs/sl_SI/withdrawals.lang
      	htdocs/langs/zh_CN/admin.lang
      	htdocs/langs/zh_CN/agenda.lang
      	htdocs/langs/zh_CN/bills.lang
      	htdocs/langs/zh_CN/boxes.lang
      	htdocs/langs/zh_CN/commercial.lang
      	htdocs/langs/zh_CN/companies.lang
      	htdocs/langs/zh_CN/compta.lang
      	htdocs/langs/zh_CN/contracts.lang
      	htdocs/langs/zh_CN/errors.lang
      	htdocs/langs/zh_CN/exports.lang
      	htdocs/langs/zh_CN/install.lang
      	htdocs/langs/zh_CN/interventions.lang
      	htdocs/langs/zh_CN/mails.lang
      	htdocs/langs/zh_CN/main.lang
      	htdocs/langs/zh_CN/members.lang
      	htdocs/langs/zh_CN/orders.lang
      	htdocs/langs/zh_CN/other.lang
      	htdocs/langs/zh_CN/products.lang
      	htdocs/langs/zh_CN/propal.lang
      	htdocs/langs/zh_CN/stocks.lang
      	htdocs/langs/zh_CN/suppliers.lang
      	htdocs/langs/zh_CN/users.lang
      	htdocs/langs/zh_TW/admin.lang
      	htdocs/langs/zh_TW/agenda.lang
      	htdocs/langs/zh_TW/banks.lang
      	htdocs/langs/zh_TW/boxes.lang
      	htdocs/langs/zh_TW/companies.lang
      	htdocs/langs/zh_TW/compta.lang
      	htdocs/langs/zh_TW/contracts.lang
      	htdocs/langs/zh_TW/errors.lang
      	htdocs/langs/zh_TW/exports.lang
      	htdocs/langs/zh_TW/install.lang
      	htdocs/langs/zh_TW/interventions.lang
      	htdocs/langs/zh_TW/mails.lang
      	htdocs/langs/zh_TW/members.lang
      	htdocs/langs/zh_TW/orders.lang
      	htdocs/langs/zh_TW/propal.lang
      	htdocs/langs/zh_TW/suppliers.lang
      447d0063
Loading