Ancuta Morarasu c6c6de6783 Merged HEAD (5.2) to 5.2.N (5.2.1) ...

126561 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124331 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
      - one more attempt (works locally, but for some reason is failing on build machines)


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

2016-05-11 12:09:14 +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 HEAD (5.2) to 5.2.N (5.2.1)

2016-05-11 12:08:24 +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 (5.2) to 5.2.N (5.2.1)

2016-05-11 12:09:14 +00:00

test-resources

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

2016-05-11 12:09:14 +00:00

wsdl

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

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