Skip to content

Commit

Permalink
Merge branch 'master' into all-contributors/add-denverquane
Browse files Browse the repository at this point in the history
  • Loading branch information
CarbonNeuron committed Jan 26, 2021
2 parents 15414ab + 902d30e commit 6c7d628
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
"infra",
"maintenance"
]
},
{
"login": "Aspen-Cyborg",
"name": "Aspen-Cyborg",
"avatar_url": "https://avatars.githubusercontent.com/u/78032877?v=4",
"profile": "https://github.com/Aspen-Cyborg",
"contributions": [
"design",
"content"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/varedz"><img src="https://avatars.githubusercontent.com/u/56739551?v=4?s=100" width="100px;" alt=""/><br /><sub><b>varedz</b></sub></a><br /><a href="https://github.com/automuteus/amonguscapture/commits?author=varedz" title="Code">πŸ’»</a></td>
<td align="center"><a href="https://wolfhound.xyz"><img src="https://avatars.githubusercontent.com/u/58155937?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aiden</b></sub></a><br /><a href="#design-Wolfhound905" title="Design">🎨</a> <a href="#ideas-Wolfhound905" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center"><a href="http://automute.us"><img src="https://avatars.githubusercontent.com/u/9044037?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Denver Quane</b></sub></a><br /><a href="#ideas-denverquane" title="Ideas, Planning, & Feedback">πŸ€”</a> <a href="#infra-denverquane" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a> <a href="#maintenance-denverquane" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/Aspen-Cyborg"><img src="https://avatars.githubusercontent.com/u/78032877?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aspen-Cyborg</b></sub></a><br /><a href="#design-Aspen-Cyborg" title="Design">🎨</a> <a href="#content-Aspen-Cyborg" title="Content">πŸ–‹</a></td>
</tr>
</table>

Expand Down

0 comments on commit 6c7d628

Please sign in to comment.