diff options
| author | Mohamed Ashraf <mohamed.ashraf.213@gmail.com> | 2013-07-29 20:12:04 +0400 |
|---|---|---|
| committer | Mohamed Ashraf <mohamed.ashraf.213@gmail.com> | 2013-07-29 20:12:04 +0400 |
| commit | b83f0eb463a670ff529fb730d7f11e77a3a501d7 (patch) | |
| tree | 84b8308ceda8adc6dcf433d755989d682807d9e4 /config.sample.inc.php | |
| parent | 75ba7b9526c8f50a50f8293d602ecb56c582946f (diff) | |
| parent | 51f5a3eb6550d6aa9ad4929dd334b7bc3f528019 (diff) | |
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
ChangeLog
doc/config.rst
js/messages.php
libraries/config/setup.forms.php
version_check.php
changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
Diffstat (limited to 'config.sample.inc.php')
| -rw-r--r-- | config.sample.inc.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.sample.inc.php b/config.sample.inc.php index 08c396ce8f..d45c0f7c2d 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -59,6 +59,9 @@ $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]['users'] = 'pma__users'; +// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; +// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; |