Ensure U4-8720 is properly merged into v8

This commit is contained in:
Stephan
2016-11-05 12:22:57 +01:00
parent 467ed87c3b
commit 8aa730d986
10 changed files with 179 additions and 34 deletions

View File

@@ -21,9 +21,9 @@ namespace Umbraco.Web
IEnumerable<IPublishedContent> ContentAtRoot();
IPublishedContent Media(int id);
//IPublishedContent Media(Guid id);
IPublishedContent Media(Guid id);
IEnumerable<IPublishedContent> Media(IEnumerable<int> ids);
//IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids);
IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids);
IEnumerable<IPublishedContent> MediaAtRoot();
/// <summary>