Laurent Destailleur f884f16564 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/boxes.php htdocs/comm/action/card.php htdocs/core/class/html.formfile.class.php		2014-12-03 12:54:42 +01:00
..
standard	Merge pull request #2114 from frederic34/patch-4	2014-12-02 19:56:04 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
init_menu_auguria.sql	Fixed: Missing picto	2014-11-29 20:41:09 +01:00