Skip to content

Commit 5e7fd5a

Browse files
authored
Merge branch '2.1' into all-contributors/add-makerbase-mks
2 parents 9be6e91 + d45eca5 commit 5e7fd5a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

.all-contributorsrc

+10
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,16 @@
314314
"financial",
315315
"platform"
316316
]
317+
},
318+
{
319+
"login": "abcpibot",
320+
"name": "abcpibot",
321+
"avatar_url": "https://avatars.githubusercontent.com/u/5948988?v=4",
322+
"profile": "https://github.com/abcpibot",
323+
"contributions": [
324+
"financial",
325+
"platform"
326+
]
317327
}
318328
],
319329
"contributorsPerLine": 7,

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
161161
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rondlh"><img src="https://avatars.githubusercontent.com/u/77279634?v=4?s=100" width="100px;" alt="rondlh"/><br /><sub><b>rondlh</b></sub></a><br /><a href="https://github.com/luc-github/ESP3D-WEBUI/commits?author=rondlh" title="Code">💻</a> <a href="https://github.com/luc-github/ESP3D-WEBUI/pulls?q=is%3Apr+reviewed-by%3Arondlh" title="Reviewed Pull Requests">👀</a></td>
162162
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jeyeager65"><img src="https://avatars.githubusercontent.com/u/28162926?v=4?s=100" width="100px;" alt="Jason Yeager"/><br /><sub><b>Jason Yeager</b></sub></a><br /><a href="#financial-jeyeager65" title="Financial">💵</a></td>
163163
<td align="center" valign="top" width="14.28%"><a href="https://discord.gg/yNwksQvZmQ"><img src="https://avatars.githubusercontent.com/u/12979070?v=4?s=100" width="100px;" alt="makerbase"/><br /><sub><b>makerbase</b></sub></a><br /><a href="#financial-makerbase-mks" title="Financial">💵</a> <a href="#platform-makerbase-mks" title="Packaging/porting to new platform">📦</a></td>
164+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/abcpibot"><img src="https://avatars.githubusercontent.com/u/5948988?v=4?s=100" width="100px;" alt="abcpibot"/><br /><sub><b>abcpibot</b></sub></a><br /><a href="#financial-abcpibot" title="Financial">💵</a> <a href="#platform-abcpibot" title="Packaging/porting to new platform">📦</a></td>
165+
164166
</tr>
165167
</tbody>
166168
</table>

0 commit comments

Comments
 (0)