Mads Rasmussen 451f894976 Merge branch 'temp8' into temp8-83 ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

2018-07-02 10:07:50 +02:00

..

App_Browsers

Renormalize

2018-06-29 19:52:40 +02:00

App_Plugins/ModelsBuilder

Fix up modelsbuilder dashboard - we now use ng-bind-html directive as opposed to ng-bind-html-unsafe

2018-06-13 12:27:22 +01:00

config

Renormalize

2018-06-29 19:52:40 +02:00

Content

Port 7.7 - WIP

2017-09-08 19:39:13 +02:00

Media

…

Properties

Renormalize

2018-06-29 19:52:40 +02:00

Umbraco

Merge branch 'temp8' into temp8-83

2018-07-02 10:07:50 +02:00

umbraco_client

Renormalize

2018-06-29 19:52:40 +02:00

Views

Renormalize

2018-06-29 19:52:40 +02:00

default.aspx

Renormalize

2018-06-29 19:52:40 +02:00

Global.asax

Renormalize

2018-06-29 19:52:40 +02:00

Umbraco.Web.UI.csproj

Renormalize

2018-06-29 19:52:40 +02:00

web.Template.config

Renormalize

2018-06-29 19:52:40 +02:00

web.Template.Debug.config

Renormalize

2018-06-29 19:52:40 +02:00

web.Template.Release.config

Renormalize

2018-06-29 19:52:40 +02:00