Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-04-25 12:14:27 +02:00
commit 1ad66dc869
2 changed files with 2 additions and 2 deletions

View File

@ -1385,7 +1385,7 @@ Navigation panel setup
.. config:option:: $cfg['MaxNavigationItems']
:type: integer
:default: 250
:default: 25
The number of items (tables, columns, indexes) that can be displayed on each
page of the navigation tree.

View File

@ -859,7 +859,7 @@ $cfg['FirstLevelNavigationItems'] = 25;
*
* @global integer $cfg['MaxNavigationItems']
*/
$cfg['MaxNavigationItems'] = 250;
$cfg['MaxNavigationItems'] = 25;
/**
* turn the select-based light menu into a tree