merging 5.8.0 and 6.1.1 changes

This commit is contained in:
JT Smith 2004-07-18 17:43:08 +00:00
parent ae87943d1e
commit 797b8581b6
14 changed files with 109 additions and 16296 deletions

View file

@ -12,8 +12,6 @@ extrasPath = /data/WebGUI/www/extras
uploadsURL = /uploads
uploadsPath = /data/WebGUI/www/uploads
useSharedInternationalCache = 1
templateCacheType=file
emailRecoveryLoggingEnabled = 1