Laurent Destailleur 0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/core/boxes/box_activity.php htdocs/filefunc.inc.php		2013-01-16 14:11:19 +01:00
..
smartphone	Qual: Removed useless param	2013-01-15 12:48:46 +01:00
standard	Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file	2013-01-15 15:42:39 +01:00
index.php	Fix: add empty index files	2011-10-24 15:27:10 +02:00
init_menu_auguria.sql	Fix: Bad menu def	2013-01-15 18:49:53 +01:00
init_menu_smartphone.sql	Qual: Removed useless page	2012-09-05 18:28:12 +02:00