huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Justin Kotalik 2018-11-01 14:42:53 -07:00
parent 3fb2949b51 04c6c6bab8
commit b7162e23ca
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
korebuild-lock.txt
View File

@ -1,2 +1,7 @@
<<<<<<< HEAD
version:3.0.0-alpha1-20181004.7 version:3.0.0-alpha1-20181004.7
commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2 commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2
=======
version:2.2.0-preview2-20181004.6
commithash:c04c4b2f5018632647f96210ab01876661302dac
>>>>>>> release/2.2