Shannon 5d028eea04 Merge branch 'temp8' into temp8-3675-variant-tags ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html

2018-12-10 14:07:20 +11:00

..

assets/img

…

docs

Revert "Temp8 tinymce"

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

lib

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

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

src

Merge branch 'temp8' into temp8-3675-variant-tags

2018-12-10 14:07:20 +11: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

don't ship with moments libraries including locales

2018-11-29 14:24:15 +01:00

package-lock.json

Merge branch 'temp8-3527-indexes-via-code' into temp8

2018-12-07 09:27:38 +01:00

package.json

Fix package.json after merge

2018-12-07 09:24:15 +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