Merge branch 'release' into dev

This commit is contained in:
Pranav K 2015-06-03 22:47:04 -07:00
commit 5e1fb16071
1 changed files with 1 additions and 1 deletions

View File

@ -7,7 +7,6 @@
"Microsoft.Framework.Localization.Abstractions": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
"System.Resources.ReaderWriter": "4.0.0-*"
},
"frameworks": {
@ -19,6 +18,7 @@
"System.Collections.Concurrent": "4.0.10-beta-*",
"System.Globalization": "4.0.10-beta-*",
"System.Linq": "4.0.0-beta-*",
"System.Resources.ReaderWriter": "4.0.0-beta-*",
"System.Resources.ResourceManager": "4.0.0-beta-*",
"System.Threading": "4.0.10-beta-*"
}