Merge with default

--HG--
branch : NH3
This commit is contained in:
Sebastien Ros
2012-07-17 14:47:14 -07:00
5 changed files with 11 additions and 11 deletions

View File

@@ -1,12 +1,12 @@
c47525e90819321d37962a11313006a4ccfc8362 src/Orchard.Web/Modules/Orchard.AntiSpam
f41ead8138ef8eaec32e2c2826100ca175c15730 src/Orchard.Web/Modules/Orchard.Autoroute
5eb5861244852a382332abfbfe2d28ac1b9bd419 src/Orchard.Web/Modules/Orchard.ContentPermissions
d466369118538a8ca77754d047ee841d016ea9c2 src/Orchard.Web/Modules/Orchard.ContentPicker
8ac5b68b6ad42cfce6be53e6bd776a35ac14c6e7 src/Orchard.Web/Modules/Orchard.CustomForms
947ac9d443cf2a83ce50f3f214ee673728160df1 src/Orchard.Web/Modules/Orchard.ContentPicker
b639c7ca01fc23837be54285e1de56bf3a47adae src/Orchard.Web/Modules/Orchard.CustomForms
b639cb33d2ba038de6048350400b664399608996 src/Orchard.Web/Modules/Orchard.Forms
b748de63e3cf8debfc3eba77f26089705147047d src/Orchard.Web/Modules/Orchard.Rules
419399ef2e37122a000e6cc8674148d3183d7032 src/Orchard.Web/Modules/Orchard.TaskLease
63dda71453ebbfd0e165662a0d56c9c0a7a3d3d4 src/Orchard.Web/Modules/Orchard.Tokens
a47761330447df38f714bc17797b8895721a6974 src/orchard.web/Modules/Orchard.Alias
80ada5dcf8158f432ce99fc3c7e76f5137e73473 src/orchard.web/Modules/Orchard.Projections
f649216f02ad6c2793a248a6386e94777eab4d59 src/orchard.web/modules/Orchard.Fields
04fc7e7bba44e0aa1214110616825f68aab5e5f6 src/orchard.web/modules/Orchard.Fields