Claus 5226762528 Merge branch 'temp-U4-9351' into dev-v7.6 ...

Conflicts:
	src/Umbraco.Core/Events/ImportPackageEventArgs.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Editors/PackageInstallController.cs

2017-02-10 10:08:31 +01:00

..

Actions

Fix backoffice breaking when Actions use code in their JsSource - U4-6843

2015-07-15 16:59:09 -06:00

businesslogic

Merge branch 'temp-U4-9351' into dev-v7.6

2017-02-10 10:08:31 +01:00

helpers

removes erroneous reverse call

2016-01-06 12:00:50 +01:00

Properties

…

app.config

U4-9499 Update to latest Json.Net

2017-02-08 17:47:32 +11:00

packages.config

U4-9499 Update to latest Json.Net

2017-02-08 17:47:32 +11:00

PluginManagerExtensions.cs

…

umbraco.cms.csproj

U4-9499 Update to latest Json.Net

2017-02-08 17:47:32 +11:00

umbraco.cms.csproj.DotSettings

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00