Andrei Rebegea 66c9e10176 Merged 5.2.N (5.2.2) to HEAD (5.2) ...

135685 jvonka: Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
      135683 jvonka: Merged 5.0.N (5.0.5) to 5.1.N (5.1.3)
         135681 jvonka: Merged V4.2-BUG-FIX (4.2.8) to 5.0.N (5.0.5)
            135658 jvonka: Merged 5.0.N (5.0.5) to V4.2-BUG-FIX (4.2.8)
                REPO-2110 / MNT-17477: CMIS: SXSS+CSRF vulnerability (browser binding)
                     - tweak test (for unexpected NPE in 4.2)
                     - resolve backport conflict


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

2017-06-14 17:08:19 +00:00

..

api

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

2017-06-14 17:08:19 +00:00

framework

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

2017-06-14 17:07:13 +00:00

test/workflow/api/impl

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

2016-09-06 22:02:33 +00:00

workflow/api/tests

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

2016-11-03 13:33:37 +00:00

AbstractSingleNetworkSiteTest.java

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

2016-08-09 14:14:27 +00:00

DeletedNodesTest.java

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

2016-08-09 14:15:11 +00:00