dolibarr/htdocs/user
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
..
admin Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
class Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
group Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
clicktodial.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fiche.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
home.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
index.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
info.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
ldap.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
logout.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
note.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
param_ihm.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
passwordforgotten.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
perms.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00