Michal Čihař bebba32337 Merge remote-tracking branch 'origin/QA_4_0' ...

Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php

2013-06-24 10:41:54 +02:00

18 KiB

Raw Blame History

View Raw