Emmanuel Monbroussou bc5c8f7e34 Merge branch 'pdo_migration' into 20160515-secu ... Conflicts: bureau/class/config.php bureau/class/db_mysql.php bureau/class/m_action.php bureau/class/m_variables.php		2016-05-17 15:10:37 +02:00
..
class	Merge branch 'pdo_migration' into 20160515-secu	2016-05-17 15:10:37 +02:00