dolibarr/htdocs/public
Laurent Destailleur d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
..
agenda Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
demo Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
donations Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
emailing Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
members Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
paybox Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
paypal Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
error-401.php Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
error-404.php New: a specialized menu is now used when using smartphones 2011-02-16 19:59:16 +00:00
index.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00