-
Sebastien Ros authored
# Conflicts: # src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt # src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt # src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs # src/Orchard.Web/Modules/Orchard.Fields/Module.txt # src/Orchard.Web/Modules/Orchard.Forms/Module.txt # src/Orchard.Web/Modules/Orchard.Localization/Module.txt # src/Orchard.Web/Modules/Orchard.Projections/Module.txt # src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.min.js # src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt # src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
bca5aee8
Loading