yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into temp8

Browse Source 
# Conflicts:
#	.github/README.md
#	src/Umbraco.Core/Constants-PropertyEditors.cs
#	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
This commit is contained in:
Sebastiaan Janssen
2019-01-20 21:23:51 +01:00
parent d6855d18f9 e1c9b1818e
commit 0b19c07756
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/README.md vendored
View File

@@ -1,4 +1,5 @@
_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._