Merged V1.3 to HEAD (3325:3411)

svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3325 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3334 .
   svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3334 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3411 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-07-26 11:30:27 +00:00
parent dcb735c5e3
commit 0c3112b44c
5 changed files with 207 additions and 4 deletions

View File

@@ -61,6 +61,7 @@ db.username=alfresco
db.password=alfresco
db.pool.initial=10
db.pool.max=20
db.pool.maxIdleTime=120
# Email configuration