[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 35c3eb: Fix conflict in a translation
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 35c3eb: Fix conflict in a translation key |
|
Date: |
Mon, 24 Jun 2019 09:45:25 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 35c3eb0d7e319a256df6cd7484c9927c2e2efdae
https://github.com/Dolibarr/dolibarr/commit/35c3eb0d7e319a256df6cd7484c9927c2e2efdae
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/document.php
M htdocs/adherents/note.php
M htdocs/adherents/subscription.php
M htdocs/adherents/type.php
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Fix conflict in a translation key
Commit: 28deca7100349925aefee70d897757bba5035525
https://github.com/Dolibarr/dolibarr/commit/28deca7100349925aefee70d897757bba5035525
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX #11218 #11150
Commit: 31ffa6bc69aa8b16cce3bba4f1534e0cee8ff8df
https://github.com/Dolibarr/dolibarr/commit/31ffa6bc69aa8b16cce3bba4f1534e0cee8ff8df
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX #11218 #11150
Commit: 604633afd14fea434352bcd4c59ed56d00fbec26
https://github.com/Dolibarr/dolibarr/commit/604633afd14fea434352bcd4c59ed56d00fbec26
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/document.php
M htdocs/adherents/note.php
M htdocs/adherents/subscription.php
M htdocs/adherents/type.php
M htdocs/core/class/discount.class.php
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/57140b79dc92...604633afd14f