diff options
| author | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-07-25 05:38:04 +0400 |
|---|---|---|
| committer | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-07-25 05:38:04 +0400 |
| commit | 1ae59ad0630e149cd397f94aabcd0ad6ee881814 (patch) | |
| tree | 9605dd77d091c4c070d5a435b98f1658939b5f18 /config.sample.inc.php | |
| parent | cb7c597e01296db774073b1154c85053e8dec5b4 (diff) | |
| parent | 4f0f77390b67fac3ca8f2da7cd63605ee81ad9d8 (diff) | |
Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables
Conflicts:
libraries/navigation/Nodes/Node_Database.class.php
libraries/relation.lib.php
Diffstat (limited to 'config.sample.inc.php')
| -rw-r--r-- | config.sample.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.sample.inc.php b/config.sample.inc.php index b633138a62..618e6e8ff0 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -61,7 +61,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; // $cfg['Servers'][$i]['recent'] = 'pma__recent'; // $cfg['Servers'][$i]['users'] = 'pma__users'; // $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -// $cfg['Servers'][$i]['navigation'] = 'pma__navigation'; +// $cfg['Servers'][$i]['hidden_tables'] = 'pma__hidden_tables'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; |