[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] eaa4b6: Add PR manually because of co
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] eaa4b6: Add PR manually because of conflict "#1678 & #1677... |
Date: |
Sat, 22 Nov 2014 06:37:42 -0800 |
Branch: refs/heads/3.7
Home: https://github.com/Dolibarr/dolibarr
Commit: eaa4b6cb56a9de31d37352e6540adb698b0e9e58
https://github.com/Dolibarr/dolibarr/commit/eaa4b6cb56a9de31d37352e6540adb698b0e9e58
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/compta/paiement/cheque/index.php
Log Message:
-----------
Add PR manually because of conflict "#1678 & #1677 Untranslatable token"
Commit: a47c7f02e27a6fc93dda7e84ada1f5864d98a80e
https://github.com/Dolibarr/dolibarr/commit/a47c7f02e27a6fc93dda7e84ada1f5864d98a80e
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/expedition/list.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/apercu.php
M htdocs/langs/en_US/externalsite.lang
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Compare:
https://github.com/Dolibarr/dolibarr/compare/f0d32e3b6546...a47c7f02e27a
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] eaa4b6: Add PR manually because of conflict "#1678 & #1677...,
Laurent Destailleur <=