Jamal Kaabi-Mofrad 3930d7051a Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) ...

133163 jkaabimofrad: APPSREPO-54: Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-11-28 16:54:22 +00:00

..

antlr3/org/alfresco/rest/antlr

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-05-11 10:54:46 +00:00

generated

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-05-11 10:54:46 +00:00

java/org/alfresco

Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

2016-11-28 16:54:14 +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 WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

2016-11-28 16:54:22 +00:00

test-resources

Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

2016-08-05 13:46:47 +00:00

wsdl

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

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