Marc Delisle 17932ae84b Fix merge conflict ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2015-03-03 15:37:42 -05:00
..
original	rfe #501 Support for SSL GRANT option	2015-02-27 15:53:12 +05:30
pmahomme	Fix merge conflict	2015-03-03 15:37:42 -05:00
.gitignore	Merge branch 'QA_4_0'	2013-07-27 18:10:08 +05:30
dot.gif	pma spritify part 2	2011-07-15 09:42:16 +03:00
sprites.css.php	Fix coding style	2014-07-31 11:50:42 -04:00
svg_gradient.php	Mass modifications to use PMA_String.	2014-09-06 10:44:03 +02:00