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
..
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-19 16:29:16 +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	Fix: Removed warnings	2013-01-19 14:32:37 +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