Mohamed Ashraf a2659d7ba5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting ...

Conflicts:
	ChangeLog

2013-09-29 23:13:05 +02:00

..

config_functions.lib.php

Various coding style fixes

2013-08-07 10:51:50 +02:00

ConfigFile.class.php

Fix codestyle

2013-09-07 08:20:26 -04:00

Form.class.php

Missing docs

2013-07-30 14:07:07 +02:00

FormDisplay.class.php

improve DocBlock

2013-09-25 14:46:24 +02:00

FormDisplay.tpl.php

Replace wiki info icon #1457

2013-09-28 18:57:53 +10:00

messages.inc.php

Fixed the extra new line in the messages.inc.php

2013-09-05 20:05:28 +02:00

setup.forms.php

Fixed missing comma

2013-09-10 11:57:26 +02:00

user_preferences.forms.php

Merge remote-tracking branch 'origin/master' into error_reporting

2013-09-01 13:07:52 +02:00

Validator.class.php

Fix set_error_handler call

2013-08-15 13:27:09 +02:00