Alan Davis 15ca2477e0 5.2.N and HEAD were not quite identical after the merge. The following came from HEAD but was modified when merged to 5.2.N ...

131488 Merged DEV/WEBAPP-API (5.2.0) to 5.2.N (5.2.N)
      131265 kroast: Merged 130934 from HEAD - SHA-1698

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

2016-11-03 16:35:49 +00:00

..

blogs

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

messages

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

2016-08-09 14:13:02 +00:00

templates

5.2.N and HEAD were not quite identical after the merge. The following came from HEAD but was modified when merged to 5.2.N

2016-11-03 16:35:49 +00:00

public-rest-context.xml

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

2016-11-03 14:04:21 +00:00

remote-api-context.xml

Merged 5.1.N (5.1.1) to HEAD (5.2)

2016-03-11 22:31:09 +00:00

web-scripts-application-context.xml

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

2016-11-03 13:59:24 +00:00

web-scripts-config.xml

…