lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-08 00:14:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into dev

Browse Source 
# Conflicts:
#	src/Orchard.Web/Modules/Markdown/Markdown.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Handlers/FieldIndexPartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Recipes/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
#	src/Orchard.sln
This commit is contained in:
Zoltán Lehóczky
2020-04-07 23:03:58 +02:00
parent b54d2fadc0 dbc1e61069
commit b960866531
27 changed files with 337 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CREDITS.txt
View File

@@ -191,11 +191,11 @@ Website: https://lucenenet.apache.org/
Copyright: Copyright (c) 2009 Apache Software Foundation
License: Apache Software Foundation License 2.0
MarkdownSharp
Markdig
-----
Website: http://code.google.com/p/markdownsharp/
Copyright: Copyright (c) 2009-2011 Jeff Atwood
License: MIT
Website: https://github.com/lunet-io/markdig
Copyright: Copyright (c) 2018-2019, Alexandre Mutel
License: BSD 2-Clause
Mono Class Library
-----