UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-01-27 17:29:03 +01:00
parent 342360dcfa 7df73520a6
commit 17df2f1405
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.all-contributorsrc
View File

@@ -5,6 +5,21 @@
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "quentinguidee",
"name": "Quentin",
"avatar_url": "https://avatars0.githubusercontent.com/u/12123721?v=4",
"profile": "https://github.com/quentinguidee",
"contributions": [
"code",
"doc",
"design",
"maintenance",
"projectManagement",
"question",
"review"
]
},
{
"login": "MixedMatched",
"name": "Alessandra Danielle Simmons",
@@ -14,6 +29,31 @@
"code",
"ideas",
"question"
},
{
"login": "RedGl0w",
"name": "redgl0w",
"avatar_url": "https://avatars1.githubusercontent.com/u/43498612?v=4",
"profile": "http://redgl0w.github.io",
"contributions": [
"code",
"bug",
"ideas",
"financial",
"question"
]
},
{
"login": "M4xi1m3",
"name": "M4x1m3",
"avatar_url": "https://avatars0.githubusercontent.com/u/57234558?v=4",
"profile": "https://M4xi1m3.github.io/",
"contributions": [
"code",
"bug",
"doc",
"ideas",
"question"
]
}
],

3
README.md
View File

@@ -159,7 +159,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/quentinguidee"><img src="https://avatars0.githubusercontent.com/u/12123721?v=4" width="100px;" alt=""/><br /><sub><b>Quentin</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=quentinguidee" title="Code">💻</a> <a href="https://github.com/Omega-Numworks/Omega/commits?author=quentinguidee" title="Documentation">📖</a> <a href="#design-quentinguidee" title="Design">🎨</a> <a href="#maintenance-quentinguidee" title="Maintenance">🚧</a> <a href="#projectManagement-quentinguidee" title="Project Management">📆</a> <a href="#question-quentinguidee" title="Answering Questions">💬</a> <a href="https://github.com/Omega-Numworks/Omega/pulls?q=is%3Apr+reviewed-by%3Aquentinguidee" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/MixedMatched"><img src="https://avatars1.githubusercontent.com/u/30960626?v=4" width="100px;" alt=""/><br /><sub><b>Alessandra Danielle Simmons</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=MixedMatched" title="Code">💻</a> <a href="#ideas-MixedMatched" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-MixedMatched" title="Answering Questions">💬</a></td>
<td align="center"><a href="http://redgl0w.github.io"><img src="https://avatars1.githubusercontent.com/u/43498612?v=4" width="100px;" alt=""/><br /><sub><b>redgl0w</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=RedGl0w" title="Code">💻</a> <a href="https://github.com/Omega-Numworks/Omega/issues?q=author%3ARedGl0w" title="Bug reports">🐛</a> <a href="#ideas-RedGl0w" title="Ideas, Planning, & Feedback">🤔</a> <a href="#financial-RedGl0w" title="Financial">💵</a> <a href="#question-RedGl0w" title="Answering Questions">💬</a></td>
<td align="center"><a href="https://M4xi1m3.github.io/"><img src="https://avatars0.githubusercontent.com/u/57234558?v=4" width="100px;" alt=""/><br /><sub><b>M4x1m3</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=M4xi1m3" title="Code">💻</a> <a href="https://github.com/Omega-Numworks/Omega/issues?q=author%3AM4xi1m3" title="Bug reports">🐛</a> <a href="https://github.com/Omega-Numworks/Omega/commits?author=M4xi1m3" title="Documentation">📖</a> <a href="#ideas-M4xi1m3" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-M4xi1m3" title="Answering Questions">💬</a></td>
</tr>
</table>