Merge branch 'temp8' into temp8-3096-angular-bulk-publish

# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
This commit is contained in:
Shannon
2018-11-20 19:37:39 +11:00
222 changed files with 2909 additions and 3292 deletions

View File

@@ -51,7 +51,6 @@
break;
}
// constraintValue = condition.Property.Type == "string" ? string.Format("\"{0}\"", condition.ConstraintValue) : condition.ConstraintValue;
}
switch (condition.Term.Operathor)