Merge branch 'release' into dev
This commit is contained in:
commit
8a4bcd9b4a
|
|
@ -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"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue