Shannon 8053cea92d Merge branch 'dev-v7' into dev-v7.8 ...

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/UdiEntityType.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/umbraco.cms/umbraco.cms.csproj

2017-12-14 16:24:25 +11:00

..

assets/img

…

docs

…

lib

Update thumbnails.less

2017-11-08 11:38:32 +01:00

src

Merge branch 'dev-v7' into dev-v7.8

2017-12-14 16:24:25 +11:00

test

Update client side unit tests

2017-09-29 10:44:18 +02:00

.eslintrc

…

.jshintignore

…

bower.json

Merge pull request #2066 from arknu/U4-10191-tinymce46

2017-11-01 09:42:33 +01:00

gruntFile.js

add date pickers

2017-09-04 12:58:04 +02:00

gulpfile.js

Adds files missing from build output

2017-09-18 16:52:43 +02:00

package.json

Fixes JS unit test runner

2017-09-12 16:02:40 +10:00

Umbraco.Web.UI.Client.proj.DotSettings

…