Commit Graph

3 Commits

Author SHA1 Message Date
Paul Brodner
fd300ac603 Merge branch 'TAS-949' of gitlab.alfresco.com:tas/alfresco-tas-restapi-test
# Conflicts:
#	src/main/java/org/alfresco/rest/model/RestCommentModelsCollection.java
#	src/main/java/org/alfresco/rest/model/RestPersonModel.java
#	src/main/java/org/alfresco/rest/requests/RestCommentsApi.java
#	src/main/java/org/alfresco/rest/requests/RestSitesApi.java
#	src/test/java/org/alfresco/rest/demo/RestDemoTests.java
2016-09-29 16:56:54 +03:00
Paul Brodner
ec707ff138 Merge branch 'TAS-713' of gitlab.alfresco.com:tas/alfresco-tas-restapi-test
# Conflicts:
#	src/test/resources/sanity-rest.xml
2016-09-29 15:15:21 +03:00
Paul Brodner
44b810bffa using only models as parameters
adding ListUserWithRoles (removing HashMaps)
update sanity-rest
2016-09-29 14:56:54 +03:00