Laurent Destailleur e496823778 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: .travis.yml ChangeLog htdocs/fourn/commande/fiche.php htdocs/install/mysql/migration/3.5.0-3.6.0.sql htdocs/product/stock/replenish.php		2014-07-04 14:14:40 +02:00
..
tpl	Fix: Permissions on files	2013-08-06 00:36:21 +02:00
contact.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
dispatch.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
document.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
fiche.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-07-04 14:14:40 +02:00
history.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
index.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
liste.php	Merge pull request #1604 from atm-alexis/develop_add_delivery_column_on_supplier_order	2014-06-26 21:13:20 +02:00
note.php	Removed closing php tag	2014-05-03 18:18:44 +02:00