Skip to content

Commit

Permalink
合并
Browse files Browse the repository at this point in the history
  • Loading branch information
gmf520 committed Mar 29, 2020
2 parents e9aceb1 + 575bb7c commit bb3c3a9
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 113 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ name: .NET Core

on:
push:
branches: [ master, dev/develop ]
branches:
- master
- dev/develop
pull_request:
branches: [ master ]
branches:
- master

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- [OSharpNS特性](#02)
- [快速开始](#03)
- [项目进度](#04)
- [更新记录](docs/articles/updatelogs.md)
- [更新记录](https://github.com/i66soft/osharp/releases)
- [代码生成器VSIX插件](https://marketplace.visualstudio.com/items?itemName=LiuliuSoft.osharp)
- [OSharp文档中心](https://docs.osharp.org)

Expand Down
Loading

0 comments on commit bb3c3a9

Please sign in to comment.