Laurent Destailleur f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/adherents/liste.php htdocs/compta/bank/bankid_fr.php htdocs/holiday/index.php htdocs/opensurvey/list.php		2014-09-13 19:10:05 +02:00
..
admin	Fix: $error var must use type int and be increased when error found.	2014-05-24 15:20:26 +02:00
class	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-08-06 09:12:29 +02:00
img
common.inc.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
define_holiday.php	Fix: Table holiday_user was not initialized anymore.	2014-08-06 09:08:28 +02:00
fiche.php	Fix: Table holiday_user was not initialized anymore.	2014-08-06 09:08:28 +02:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
month_report.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-06-28 14:53:28 +02:00
view_log.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-08-06 01:46:57 +02:00