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

101332: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100713: RA-55 - Move Slingshot JS Extension to Share enablement project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-04-08 16:24:03 +00:00
parent 7252dc8f76
commit fa2b5569db
5 changed files with 8 additions and 171 deletions

View File

@@ -107,9 +107,9 @@ public class VtiServerCustomResponse implements CustomResponse
}
/**
* Populates the DocLib webscript response with custom metadata
* Populates the CustomResponse with the vti metadata
*
* @return JSONObject or null
* @return JSONObject or null if the vti module is not installed.
*/
public Serializable populate()
{