Merge branch 'master' of github.com:mynetx/phpmyadmin

Browse Source

Conflicts:
	js/server_privileges.js
	server_privileges.php

...

This commit is contained in:

Jo Michael 2012-03-16 19:13:55 +01:00

parent 013fe8d240 91e0d2f584

commit a617ebd5cb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available