Laurent Destailleur 3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/core/class/extrafields.class.php		2013-06-14 19:56:07 +02:00
..
standard	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-14 19:56:07 +02:00
index.php
init_menu_auguria.sql	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-05 21:59:23 +02:00