Skip to content

Commit

Permalink
Merge branch 'master' into all-contributors/add-mzemlickis
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottzheng committed Apr 7, 2019
2 parents 9a40e80 + 576d14b commit 86c71b3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Expand Up @@ -22,6 +22,16 @@
"contributions": [
"design"
]
},
{
"login": "Sandural",
"name": "黎紫珊",
"avatar_url": "https://avatars3.githubusercontent.com/u/16163090?v=4",
"profile": "https://github.com/Sandural",
"contributions": [
"platform"

]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -144,7 +144,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
<table><tr><td align="center"><a href="https://about.me/s8321414"><img src="https://avatars2.githubusercontent.com/u/9457283?v=4" width="100px;" alt="Jeff Huang"/><br /><sub><b>Jeff Huang</b></sub></a><br /><a href="#translation-s8321414" title="Translation">🌍</a></td><td align="center"><a href="http://mzemlickis.lv"><img src="https://avatars0.githubusercontent.com/u/4556944?v=4" width="100px;" alt="Mārtiņš Zemlickis"/><br /><sub><b>Mārtiņš Zemlickis</b></sub></a><br /><a href="#design-mzemlickis" title="Design">🎨</a></td></tr></table>
<table><tr><td align="center"><a href="http://mzemlickis.lv"><img src="https://avatars0.githubusercontent.com/u/4556944?v=4" width="100px;" alt="Mārtiņš Zemlickis"/><br /><sub><b>Mārtiņš Zemlickis</b></sub></a><br /><a href="#design-mzemlickis" title="Design">🎨</a></td><td align="center"><a href="https://about.me/s8321414"><img src="https://avatars2.githubusercontent.com/u/9457283?v=4" width="100px;" alt="Jeff Huang"/><br /><sub><b>Jeff Huang</b></sub></a><br /><a href="#translation-s8321414" title="Translation">🌍</a></td><td align="center"><a href="https://github.com/Sandural"><img src="https://avatars3.githubusercontent.com/u/16163090?v=4" width="100px;" alt="黎紫珊"/><br /><sub><b>黎紫珊</b></sub></a><br /><a href="#platform-Sandural" title="Packaging/porting to new platform">📦</a></td></tr></table>


<!-- ALL-CONTRIBUTORS-LIST:END -->

Expand Down

0 comments on commit 86c71b3

Please sign in to comment.