[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e3b9a3: Merge branch 'develop' of htt
From: |
Regis Houssin |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e3b9a3: Merge branch 'develop' of https://github.com/Dolib... |
Date: |
Tue, 10 Apr 2012 06:58:13 -0700 |
Branch: refs/heads/3.2
Home: https://github.com/Dolibarr/dolibarr
Commit: e3b9a3a023e3e8c26965a7336b0b2e3523e5a1f2
https://github.com/Dolibarr/dolibarr/commit/e3b9a3a023e3e8c26965a7336b0b2e3523e5a1f2
Author: Laurent Destailleur <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 06761d97539c09feec6f92ed8f6ac6e9ec63a934
https://github.com/Dolibarr/dolibarr/commit/06761d97539c09feec6f92ed8f6ac6e9ec63a934
Author: Grand Philippe <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/admin/expedition.php
Log Message:
-----------
uniformise code
Commit: 6944d839a978252bb37ebe715ac17249d00ce47d
https://github.com/Dolibarr/dolibarr/commit/6944d839a978252bb37ebe715ac17249d00ce47d
Author: Regis Houssin <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/admin/expedition.php
Log Message:
-----------
Merge pull request #158 from grandoc/develop
uniformise code
Commit: 5e23f946f8cf4dae2e3359e5faa7708f9ef63076
https://github.com/Dolibarr/dolibarr/commit/5e23f946f8cf4dae2e3359e5faa7708f9ef63076
Author: Regis Houssin <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/perl/virtualmin/dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/admin/expedition.php
M htdocs/admin/ihm.php
M htdocs/core/class/conf.class.php
M htdocs/filefunc.inc.php
M htdocs/install/check.php
M htdocs/install/etape1.php
M htdocs/install/etape2.php
M htdocs/install/etape4.php
M htdocs/install/etape5.php
M htdocs/install/fileconf.php
M htdocs/install/inc.php
M htdocs/support/inc.php
Log Message:
-----------
Merge branch 'develop' into 3.2
Conflicts:
htdocs/admin/ihm.php
htdocs/core/class/conf.class.php
Compare: https://github.com/Dolibarr/dolibarr/compare/d319889...5e23f94
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] e3b9a3: Merge branch 'develop' of https://github.com/Dolib...,
Regis Houssin <=