Sebastien Ros
0e47295b9f
Merge branch '1.9.x' into dev
Conflicts:
src/Orchard.Web/Modules/Orchard.Comments/Web.config
src/Orchard.Web/Modules/Orchard.Fields/Web.config
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
2015-06-19 11:33:12 -07:00
..
2015-06-19 11:33:12 -07:00
2015-05-02 22:48:23 +02:00
2015-04-16 16:23:12 +02:00
2015-05-05 21:40:02 -07:00
2015-04-28 12:14:30 -07:00
2015-06-19 11:33:12 -07:00
2015-06-18 12:35:03 -07:00
2015-06-19 11:33:12 -07:00
2015-06-16 16:22:04 -07:00
2015-06-19 11:33:12 -07:00
2015-05-07 14:16:56 +02:00
2015-05-05 21:40:02 -07:00
2015-04-16 17:18:18 +02:00
2015-06-16 16:22:04 -07:00
2015-02-12 00:12:11 +01:00
2015-02-19 22:14:55 +01:00