Sebastien Ros
b26690d747
Merge branch '1.9.x' into dev
Conflicts:
src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
src/Orchard/Data/Migration/AutomaticDataMigrations.cs
src/Orchard/Environment/DefaultOrchardShell.cs
2015-09-08 17:19:58 -07:00
..
2015-02-08 13:00:31 +00:00
2012-07-13 16:25:17 -07:00
2015-07-30 15:51:28 -07:00
2015-04-29 15:15:43 -07:00
2014-03-26 17:37:01 -07:00
2014-03-26 17:37:01 -07:00
2015-07-30 15:51:28 -07:00
2015-08-27 15:31:39 -07:00
2015-07-09 14:09:29 +01:00
2015-07-30 15:49:13 -07:00
2015-06-19 10:39:00 -07:00
2015-06-23 11:20:06 -07:00
2015-09-08 17:19:58 -07:00
2014-07-30 11:16:29 -07:00
2011-01-08 10:00:01 -08:00
2012-11-20 17:21:52 -08:00
2011-09-26 15:43:57 -07:00
2014-03-26 17:37:01 -07:00
2013-11-12 17:56:02 -08:00
2013-11-12 17:51:26 -08:00
2015-08-03 17:19:08 +01:00
2014-03-17 12:09:21 -07:00
2015-07-30 15:49:13 -07:00
2013-09-11 14:12:46 -07:00
2011-11-29 10:49:01 -08:00
2015-09-04 14:47:51 -07:00
2015-07-30 15:51:28 -07:00
2015-08-11 16:43:48 +01:00
2010-12-07 15:47:45 -08:00