Skip to content

Commit

Permalink
Merge pull request #281 from JarvisCraft/sync-development-with-master
Browse files Browse the repository at this point in the history
  • Loading branch information
JarvisCraft authored Nov 4, 2021
2 parents 257ba4e + 4ec41bf commit 5d91c9d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"profile": "https://github.com/xxDark",
"contributions": [
"code",
"ideas"
"ideas",
"bug"
]
},
{
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# PADLA ![logo](./.branding/logo_512x512.png)
# PADLA
<details>
<summary>Logo</summary>

![logo](./.branding/logo_512x512.png)
</details>

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
Expand Down Expand Up @@ -42,7 +48,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="https://progrm-jarvis.ru/"><img src="https://avatars.githubusercontent.com/u/7693005?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PROgrm_JARvis</b></sub></a><br /><a href="https://github.com/JarvisCraft/padla/commits?author=JarvisCraft" title="Code">πŸ’»</a> <a href="https://github.com/JarvisCraft/padla/commits?author=JarvisCraft" title="Documentation">πŸ“–</a> <a href="#ideas-JarvisCraft" title="Ideas, Planning, & Feedback">πŸ€”</a> <a href="#maintenance-JarvisCraft" title="Maintenance">🚧</a> <a href="#platform-JarvisCraft" title="Packaging/porting to new platform">πŸ“¦</a> <a href="#projectManagement-JarvisCraft" title="Project Management">πŸ“†</a> <a href="#infra-JarvisCraft" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a> <a href="https://github.com/JarvisCraft/padla/commits?author=JarvisCraft" title="Tests">⚠️</a> <a href="https://github.com/JarvisCraft/padla/pulls?q=is%3Apr+reviewed-by%3AJarvisCraft" title="Reviewed Pull Requests">πŸ‘€</a></td>
<td align="center"><a href="https://github.com/AbstractCoderX"><img src="https://avatars.githubusercontent.com/u/38766980?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Areg Yazychyan</b></sub></a><br /><a href="#ideas-AbstractCoderX" title="Ideas, Planning, & Feedback">πŸ€”</a> <a href="https://github.com/JarvisCraft/padla/pulls?q=is%3Apr+reviewed-by%3AAbstractCoderX" title="Reviewed Pull Requests">πŸ‘€</a> <a href="#business-AbstractCoderX" title="Business development">πŸ’Ό</a> <a href="https://github.com/JarvisCraft/padla/commits?author=AbstractCoderX" title="Code">πŸ’»</a></td>
<td align="center"><a href="https://github.com/xxDark"><img src="https://avatars.githubusercontent.com/u/19853368?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xxDark</b></sub></a><br /><a href="https://github.com/JarvisCraft/padla/commits?author=xxDark" title="Code">πŸ’»</a> <a href="#ideas-xxDark" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center"><a href="https://github.com/xxDark"><img src="https://avatars.githubusercontent.com/u/19853368?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xxDark</b></sub></a><br /><a href="https://github.com/JarvisCraft/padla/commits?author=xxDark" title="Code">πŸ’»</a> <a href="#ideas-xxDark" title="Ideas, Planning, & Feedback">πŸ€”</a> <a href="https://github.com/JarvisCraft/padla/issues?q=author%3AxxDark" title="Bug reports">πŸ›</a></td>
<td align="center"><a href="http://vk.com/zabelovq"><img src="https://avatars.githubusercontent.com/u/45364639?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniil Sudomoin</b></sub></a><br /><a href="https://github.com/JarvisCraft/padla/commits?author=zabelovq" title="Code">πŸ’»</a> <a href="#ideas-zabelovq" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
</tr>
</table>
Expand All @@ -52,4 +58,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

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

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

0 comments on commit 5d91c9d

Please sign in to comment.