Sebastiaan Janssen c56e84af2d Merge branch 'dev-v7' into temp8 ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config

2019-01-20 20:28:52 +01:00

..

assets/img

…

docs

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

gulp

V8 FE Gulp Fastdev script

2019-01-18 10:12:24 +01:00

lib

Markdown editor: Fix the redo button + remove the button hover flicker

2018-12-09 14:29:39 +01:00

src

Merge branch 'dev-v7' into temp8

2019-01-20 20:28:52 +01:00

test

changing from click and focus shorthands

2018-11-28 13:22:30 +01:00

.babelrc

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

.eslintrc

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

gulpfile.js

V8 FE Gulp Fastdev script

2019-01-18 10:12:24 +01:00

package-lock.json

Fix merge + cleanup

2019-01-18 15:05:20 +01:00

package.json

Fix merge + cleanup

2019-01-18 15:05:20 +01:00

setupgulp.bat

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Umbraco.Web.UI.Client.proj.DotSettings

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00