Marc Delisle a83ca5d73b Fix merge conflict ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2014-06-10 12:43:07 -04:00
..
auth	Correctly set static properties in testsuite	2014-06-06 13:01:14 +02:00
export	Fix merge conflict	2014-06-10 12:43:07 -04:00
import	Fix coding style	2014-06-03 12:59:55 -04:00
transformations	Fix coding style	2014-06-03 12:40:21 -04:00
PMA_PluginManager_test.php	Remove trailing white spaces	2013-11-03 19:13:23 +05:30