dolibarr/htdocs/adherents
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 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
canvas Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
cartes 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
stats Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
agenda.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
card_subscriptions.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
cotisations.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
document.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fiche_subscription.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
fiche.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
htpasswd.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
index.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
info_subscription.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
liste.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
note.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
type.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00