Michal Čihař daaf6dff2d Merge branch 'setup-css' of https://github.com/mynetx/phpmyadmin into merge ... Conflicts: setup/index.php		2012-05-17 15:56:11 +02:00
..
.htaccess	add missing .htaccess	2010-08-03 00:57:14 +02:00
config.inc.php	Fix new checkstyle warnings	2012-04-29 03:16:11 +02:00
form.inc.php	Use PMA_fatalError instead of die	2012-05-09 11:58:10 +02:00
index.inc.php	Merge branch 'setup-css' of https://github.com/mynetx/phpmyadmin into merge	2012-05-17 15:56:11 +02:00
menu.inc.php	add vim directive for indenting with spaces	2012-04-11 16:18:53 +02:00
servers.inc.php	add vim directive for indenting with spaces	2012-04-11 16:18:53 +02:00