Shannon ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 ...

# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx

2018-10-23 22:16:48 +11:00

..

assets/img

…

docs

…

lib

Merge remote-tracking branch 'origin/dev-v7' into temp8

2018-10-22 16:03:01 +11:00

src

Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8

2018-10-23 22:16:48 +11:00

test

fix paths in karma test

2018-10-11 15:31:39 +02:00

.babelrc

add babel + babel config

2018-10-07 20:01:20 +02:00

.eslintrc

add babel + babel config

2018-10-07 20:01:20 +02:00

gulpfile.js

Added clean-css to the client side build process (#3371)

2018-10-21 16:27:39 +02:00

package-lock.json

Manual merging

2018-10-23 16:12:23 +11:00

package.json

Manual merging

2018-10-22 17:04:58 +11:00

setupgulp.bat

Don't need to globally install bower anymore in this helper batch script

2018-10-11 10:54:45 +01:00

Umbraco.Web.UI.Client.proj.DotSettings

…