Merge branch origin/dev-v7 into dev-v7-deploy

2016-08-18 12:38:38 +02:00
parent 01990394dd f658613fad
commit acae05d287
665 changed files with 22645 additions and 17351 deletions
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -69,7 +69,16 @@ namespace Umbraco.Core.IO
            }
        }

-		public static string AppPlugins
+        public static string AppCode
+        {
+            get
+            {
+                //NOTE: this is not configurable and shouldn't need to be
+                return "~/App_Code";
+            }
+        }
+
+        public static string AppPlugins
 		{
 			get
 			{