Shannon 82820284f3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 ...

# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs

2018-03-16 14:30:55 +11:00

..

DisabledFeatures.cs

Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings

2018-03-14 13:56:49 +11:00

EnabledFeatures.cs

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10

2018-03-16 14:30:55 +11:00

FeaturesResolver.cs

U4-10789 - cleanup + beta003

2018-01-10 15:24:58 +01:00

UmbracoFeatures.cs

Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings

2018-03-14 13:56:49 +11:00