Laurent Destailleur 6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/holiday/fiche.php

2013-05-11 15:26:24 +02:00

..

standard

Merge remote-tracking branch 'origin/3.4' into develop

2013-05-11 15:26:24 +02:00

index.php

…

init_menu_auguria.sql

[ task #877 ] Reorganize menus. Works with auguria menu

2013-05-07 10:15:49 +02:00