Laurent Destailleur ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/list.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/lib/functions.lib.php htdocs/expedition/note.php htdocs/fourn/commande/liste.php htdocs/fourn/facture/fiche.php htdocs/main.inc.php htdocs/projet/tasks/index.php htdocs/theme/eldy/style.css.php		2014-05-29 19:20:48 +02:00
..
standard	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-29 19:20:48 +02:00
index.php
init_menu_auguria.sql	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00