Fixing merge errors and side effects.

--HG--
branch : dev
This commit is contained in:
Suha Can
2011-02-22 18:17:17 -08:00
parent 7842a0f79b
commit 0b3fb811ad
10 changed files with 16 additions and 12 deletions

View File

@@ -8,10 +8,10 @@
<Tags>blog</Tags>
<Version>1.0</Version>
</Recipe>
<Feature enable="Orchard.Blogs,Orchard.Comments,Orchard.Tags,
XmlRpc,Orchard.Blogs.RemotePublishing,
TinyMce,Orchard.Media,Orchard.PublishLater,
TinyMce,Orchard.Media,Orchard.MediaPicker,Orchard.PublishLater,
Orchard.jQuery,Orchard.Widgets,
Orchard.Scripting,Orchard.Scripting.Lightweight,
PackagingServices,Orchard.Packaging,Gallery,