Derek Hulley a75defb600 Resolved merge conflict resolution ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7295 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2007-11-05 15:22:59 +00:00

..

java/org/alfresco/web

Resolved merge conflict resolution

2007-11-05 15:22:59 +00:00

meta-inf

New build scripts

2007-03-04 19:05:34 +00:00

test-resources

xforms dojo to mootools port.

2007-10-02 20:34:22 +00:00

web

Updates to Presence client-side components

2007-11-05 15:19:34 +00:00