mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 03:25:23 +08:00
Fix merge errors
--HG-- branch : dev
This commit is contained in:
@@ -95,6 +95,5 @@ namespace Orchard.Blogs.Controllers {
|
||||
// Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
|
||||
return View((object)blog);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -9,4 +9,5 @@
|
||||
bool IsAssemblyLoaded(string name);
|
||||
|
||||
void RestartAppDomain();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user