Merge branch 'master' into DS-2604-porting-cc

This commit is contained in:
Luigi Andrea Pascarelli
2016-09-26 11:10:24 +02:00
29 changed files with 129 additions and 65 deletions

View File

@@ -113,8 +113,8 @@ public interface SearchService {
* If a user has the appropriate rights to administrate communities and/or
* collections we want to look up all contents of those communities and/or
* collections, ignoring the read policies of the items (e.g. to list all
* private items of communities/collections the user administrate). This
* method returns a query to filter for items that belongs to those
* private items of communities/collections the user administrates). This
* method returns a query to filter for items that belong to those
* communities/collections only.
*
* @param context