Laurent Destailleur abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/core/boxes/box_activity.php		2013-01-19 16:29:16 +01:00
..
admin	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-16 15:45:17 +01:00
ajax	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
canvas	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
class	Fix: Removed warnings	2013-01-19 14:32:37 +01:00
composition	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
stats	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
stock	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.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-16 15:45:17 +01:00
fournisseurs.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
liste.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
photos.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
popuprop.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
price.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
reassort.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
traduction.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00