Sebastiaan Jansssen 646abb3aea Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7 ...

# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml

2018-02-01 08:57:47 +01:00

..

assets/img

…

docs

…

lib

Update thumbnails.less

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

src

Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7

2018-02-01 08:57:47 +01:00

test

Update client side unit tests

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

.eslintrc

…

.jshintignore

…

bower.json

remove moment resolution for bower.json

2018-01-12 08:52:13 +01:00

gulpfile.js

Adds files missing from build output

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

package.json

Update client build NPM dependancy for gulp-connect to use 5.0.0 as next/latest version required you to use CoffeeScript to compile their src code to use the module/component

2018-01-03 11:56:39 +00:00

Umbraco.Web.UI.Client.proj.DotSettings

…