Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:49:33 -07:00
commit 8a4bcd9b4a
2 changed files with 2 additions and 4 deletions

View File

@ -30,7 +30,6 @@
"System.ComponentModel.TypeConverter": "4.0.1-*" "System.ComponentModel.TypeConverter": "4.0.1-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net451+win8" "portable-net451+win8"
] ]
} }

View File

@ -30,7 +30,6 @@
"System.Text.RegularExpressions": "4.0.12-*" "System.Text.RegularExpressions": "4.0.12-*"
}, },
"imports": [ "imports": [
"dotnet5.4",
"portable-net451+win8" "portable-net451+win8"
] ]
} }