Laurent Destailleur 6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/holiday/class/holiday.class.php htdocs/user/fiche.php		2013-02-12 15:17:22 +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-02-12 15:17:22 +01:00
img
common.inc.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-02-12 15:17:22 +01:00
define_holiday.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
index.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-02-12 15:17:22 +01:00
month_report.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-16 15:45:17 +01:00
view_log.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00