The branch, master has been updated via 04fc2f62b0d9ab10db4f82465ca23a1f7e7f48d7 (commit) via 0b9cf14f754935696b6068b238ecc5ed3d3749fd (commit) from 8077fe65b6a1b58a2c2164bc4abc352c64f17ae6 (commit)

- Log ----------------------------------------------------------------- commit 04fc2f62b0d9ab10db4f82465ca23a1f7e7f48d7 Merge: 8077fe65b6a1b58a2c2164bc4abc352c64f17ae6 0b9cf14f754935696b6068b238ecc5ed3d3749fd Author: Marc Delisle marc@infomarc.info Date: Sat Jul 17 09:56:24 2010 -0400

fix merge conflict

-----------------------------------------------------------------------

Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation.html b/Documentation.html index 1d5b25e..427f964 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1867,7 +1867,7 @@ $cfg['TrustedProxies'] = editing.</dd>

<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters showen in any non-numeric column on browse view. + <dd>Maximum number of characters shown in any non-numeric field on browse view. Can be turned off by a toggle button on the browse page.</dd>

<dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean

hooks/post-receive