Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hkalexling/Mango
Browse files Browse the repository at this point in the history
  • Loading branch information
hkalexling committed Jan 11, 2021
2 parents 653751b + c2e2f0b commit 0b457a2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
18 changes: 14 additions & 4 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"profile": "https://github.com/jaredlt",
"contributions": [
"code",
"ideas",
"design"
"ideas",
"design"
]
},
{
Expand Down Expand Up @@ -57,7 +57,7 @@
"profile": "https://github.com/flying-sausages",
"contributions": [
"doc",
"ideas"
"ideas"
]
},
{
Expand Down Expand Up @@ -86,7 +86,17 @@
"contributions": [
"code"
]
},
{
"login": "h45h74x",
"name": "Simon",
"avatar_url": "https://avatars1.githubusercontent.com/u/27204033?v=4",
"profile": "http://h45h74x.eu.org",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
"contributorsPerLine": 7,
"skipCi": true
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Please check the [development guideline](https://github.com/hkalexling/Mango/wik
</tr>
<tr>
<td align="center"><a href="https://github.com/Leeingnyo"><img src="https://avatars0.githubusercontent.com/u/6760150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>이인용</b></sub></a><br /><a href="https://github.com/hkalexling/Mango/commits?author=Leeingnyo" title="Code">💻</a></td>
<td align="center"><a href="http://h45h74x.eu.org"><img src="https://avatars1.githubusercontent.com/u/27204033?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon</b></sub></a><br /><a href="https://github.com/hkalexling/Mango/commits?author=h45h74x" title="Code">💻</a></td>
</tr>
</table>

Expand Down

0 comments on commit 0b457a2

Please sign in to comment.