Marc Delisle 269d0c89fe Fix merge conflicts

2013-07-28 06:17:38 -04:00

..

config_functions.lib.php

Fix alignment of doc comments

2013-06-11 21:54:34 +05:30

ConfigFile.class.php

Fix merge conflicts

2013-05-15 13:07:22 -04:00

Form.class.php

Space after exclamation mark

2013-04-12 22:09:26 +05:30

FormDisplay.class.php

Convert validate.lib.php to class PMA_Validator

2013-07-11 14:29:20 +05:45

FormDisplay.tpl.php

Validator names fix

2013-07-12 16:12:46 +05:45

messages.inc.php

Change feature name from 'navigation' to 'navigationhiding'

2013-07-27 21:11:44 +05:30

setup.forms.php

Change tables name from 'navigation' to 'navigationhiding'

2013-07-25 21:26:23 +05:30

user_preferences.forms.php

Bug #3960 NavigationBarIconic config not honored

2013-06-21 10:00:41 -04:00

Validator.class.php

Fix merge conflicts

2013-07-28 06:17:38 -04:00