Merge branch 'release' into dev

This commit is contained in:
Pranav K 2014-10-29 11:04:28 -07:00
commit fb51830598
6 changed files with 6 additions and 6 deletions

View File

@ -6,7 +6,7 @@
"Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
"Microsoft.Framework.DependencyInjection": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Newtonsoft.Json": "6.0.4"
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": {},

View File

@ -8,7 +8,7 @@
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.OptionsModel": "1.0.0-*",
"Newtonsoft.Json": "6.0.4"
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": {

View File

@ -8,7 +8,7 @@
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.OptionsModel": "1.0.0-*",
"Newtonsoft.Json": "6.0.4",
"Newtonsoft.Json": "6.0.6",
},
"frameworks": {
"aspnet50": {

View File

@ -8,7 +8,7 @@
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.OptionsModel": "1.0.0-*",
"Newtonsoft.Json": "6.0.4"
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": {

View File

@ -6,7 +6,7 @@
"Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Newtonsoft.Json": "6.0.4"
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": {

View File

@ -7,7 +7,7 @@
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.OptionsModel": "1.0.0-*",
"Newtonsoft.Json": "6.0.4"
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": {