Laurent Destailleur 6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/core/menus/standard/eldy.lib.php		2015-07-30 14:54:33 +02:00
..
standard	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-07-30 14:54:33 +02:00
index.php
init_menu_auguria.sql	Fix: Bad permission assignments for stock movements actions	2015-04-07 20:28:45 +02:00