[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4
|
From: |
Juanjo Menent |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4 |
|
Date: |
Wed, 23 Mar 2016 14:59:42 -0700 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: 444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
https://github.com/Dolibarr/dolibarr/commit/444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-11 (Fri, 11 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.7.4
Commit: 20d785ad28e92230bdc61295f06d5787ff3e21c8
https://github.com/Dolibarr/dolibarr/commit/20d785ad28e92230bdc61295f06d5787ff3e21c8
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
Commit: 52d88db5c3e9565fa4a3074ef9353916c81bb293
https://github.com/Dolibarr/dolibarr/commit/52d88db5c3e9565fa4a3074ef9353916c81bb293
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: e2b4d39292de9daf9f65489faa6d951e7239acb0
https://github.com/Dolibarr/dolibarr/commit/e2b4d39292de9daf9f65489faa6d951e7239acb0
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: 84e5c8b437ebeee7afea8f9c609eb457ba4b876f
https://github.com/Dolibarr/dolibarr/commit/84e5c8b437ebeee7afea8f9c609eb457ba4b876f
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b8bc881e5af2a40702901fa42905de07a16ef808
https://github.com/Dolibarr/dolibarr/commit/b8bc881e5af2a40702901fa42905de07a16ef808
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
https://github.com/Dolibarr/dolibarr/commit/b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge branch '3.8_fix_merge' into 3.9_fix_merge
Commit: 6efae723f5cd748e8a927c41f7e5746d9d7f370f
https://github.com/Dolibarr/dolibarr/commit/6efae723f5cd748e8a927c41f7e5746d9d7f370f
Author: Juanjo Menent <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4882 from hregis/3.9_fix_merge
Fix: 3.8-3.9 fix merge
Compare:
https://github.com/Dolibarr/dolibarr/compare/8189a5eadd1c...6efae723f5cd