Laurent Destailleur 3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 ...

Conflicts:
	htdocs/core/lib/admin.lib.php

2016-03-02 23:07:42 +01:00

..

index.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-03-02 23:07:42 +01:00

perday.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-28 12:18:25 +01:00

perweek.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-28 12:18:25 +01:00