diff options
author | Rouslan Placella <rouslan@placella.com> | 2012-06-10 17:47:10 +0400 |
---|---|---|
committer | Rouslan Placella <rouslan@placella.com> | 2012-06-10 17:47:10 +0400 |
commit | 8f698c7c82908e43f291e1969bf30b151bf94bd1 (patch) | |
tree | 82cbdf0f7b9cb89e14f67f9127c4681635f70b61 | |
parent | 5336e1805194614ef285624d7c48515e1ca814d4 (diff) | |
parent | b1855ec0b428ea8ba62f752e5fdca51c5b3881a9 (diff) |
Merge branch 'QA_3_5'
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | config.sample.inc.php | 1 |
2 files changed, 1 insertions, 1 deletions
@@ -54,6 +54,7 @@ VerboseMultiSubmit, ReplaceHelpImg - bug #3531584 [interface] No form validation in change password dialog - bug #3531585 [interface] Broken password validation in copy user form - bug #3531586 [unterface] Add user form prints JSON when user presses enter +- bug #3534121 [config] duplicate line in config.sample.inc.php 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/config.sample.inc.php b/config.sample.inc.php index 69bc6242d5..7a16073bac 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -58,7 +58,6 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; // $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; // $cfg['Servers'][$i]['recent'] = 'pma_recent'; -// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; |