Alan Davis 5f5774584f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud) ...

88174: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      88133: Reverse Merge V4.2-BUG-FIX (4.2.4)
         88031: MNT-12414 Action menu renders two 'cancel edit' actions when working copy opened in webdav by second user.


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

2015-01-31 09:59:44 +00:00

..

antlr3/org/alfresco/rest/antlr

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

generated

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-07-22 14:13:46 +00:00

java/org/alfresco

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

2015-01-31 09:59:44 +00:00

test/apptest

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

test-java/org/alfresco

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

2015-01-31 09:50:16 +00:00

test-resources

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-18 17:17:50 +00:00

wsdl

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-07-22 14:13:46 +00:00