[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 85d51b: Correct of problem of merging
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 85d51b: Correct of problem of merging with my last commits |
Date: |
Tue, 29 Mar 2016 10:41:51 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 85d51b0d6fb82a59b07faff86a9f70a36921799a
https://github.com/Dolibarr/dolibarr/commit/85d51b0d6fb82a59b07faff86a9f70a36921799a
Author: aspangaro <address@hidden>
Date: 2016-03-28 (Mon, 28 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
A htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql
A htdocs/install/mysql/tables/llx_c_accountancy_category.sql
Log Message:
-----------
Correct of problem of merging with my last commits
Commit: 8acf39cbb1061de537505820c0fcdae6789dd0ec
https://github.com/Dolibarr/dolibarr/commit/8acf39cbb1061de537505820c0fcdae6789dd0ec
Author: aspangaro <address@hidden>
Date: 2016-03-28 (Mon, 28 Mar 2016)
Changed paths:
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
R htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql
R htdocs/install/mysql/tables/llx_c_accountancy_category.sql
A htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
A htdocs/install/mysql/tables/llx_c_accounting_category.sql
Log Message:
-----------
Uniformize name of table
Commit: 3142fd3d841c606460c33ef63eeeb7bc2ff81308
https://github.com/Dolibarr/dolibarr/commit/3142fd3d841c606460c33ef63eeeb7bc2ff81308
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
A htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
A htdocs/install/mysql/tables/llx_c_accounting_category.sql
Log Message:
-----------
Merge pull request #4899 from aspangaro/4.0-p7
Correct problem of merging with my last commits
Compare:
https://github.com/Dolibarr/dolibarr/compare/718e9a72261a...3142fd3d841c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 85d51b: Correct of problem of merging with my last commits,
Laurent Destailleur <=