mirror of
https://github.com/Hessenuk/DiscordTickets.git
synced 2024-11-05 04:13:08 +02:00
fix: conflicts
This commit is contained in:
Isaac
commit
8ffa5a64b5
@ -78,10 +78,10 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "davidjcralph",
|
||||
"login": "davidcralph",
|
||||
"name": "David Ralph",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/14052956?v=4",
|
||||
"profile": "https://davidjcralph.co.uk/",
|
||||
"profile": "https://davidcralph.co.uk/",
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
@ -150,6 +150,91 @@
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "RooRay",
|
||||
"name": "RooRay",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/86845749?v=4",
|
||||
"profile": "https://rooray.xyz",
|
||||
"contributions": [
|
||||
"doc",
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "FoxXxHater",
|
||||
"name": "FoxXxHater",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/54017453?v=4",
|
||||
"profile": "https://foxco-network.de",
|
||||
"contributions": [
|
||||
"platform"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "AdminRAT",
|
||||
"name": "AdminRAT",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/24538037?v=4",
|
||||
"profile": "https://adminrat.codes",
|
||||
"contributions": [
|
||||
"platform"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "c43721",
|
||||
"name": "c43721",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/55610086?v=4",
|
||||
"profile": "https://c43721.dev",
|
||||
"contributions": [
|
||||
"platform",
|
||||
"doc"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "n1kkl",
|
||||
"name": "Niklas",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/100782498?v=4",
|
||||
"profile": "https://github.com/n1kkl",
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "Uzurka",
|
||||
"name": "Uzurka",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/101745008?v=4",
|
||||
"profile": "https://github.com/Uzurka",
|
||||
"contributions": [
|
||||
"bug",
|
||||
"platform",
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "iNOEEL",
|
||||
"name": "Noel Horvath",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/26775559?v=4",
|
||||
"profile": "https://github.com/iNOEEL",
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "Gdanycz",
|
||||
"name": "Gdany",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/60316826?v=4",
|
||||
"profile": "https://github.com/Gdanycz",
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "Chaosfelix4451",
|
||||
"name": "Chaosfelix4451",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/46029764?v=4",
|
||||
"profile": "https://github.com/Chaosfelix4451",
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
}
|
||||
],
|
||||
"contributorsPerLine": 7,
|
||||
|
||||
3
.github/SECURITY.md
vendored
3
.github/SECURITY.md
vendored
@ -13,4 +13,5 @@ Release versions that will receive security updates.
|
||||
|
||||
## Reporting a vulnerability
|
||||
|
||||
If you find a vulnerability, please send an email to [contact@discordtickets.app](mailto:contact@discordtickets.app).
|
||||
If you find a vulnerability, please use for the [security advisories form](https://github.com/discord-tickets/bot/security/advisories/new)
|
||||
or send an email to [contact@discordtickets.app](mailto:contact@discordtickets.app).
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
|
||||
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
||||
[](#contributors-)
|
||||
<a href="https://github.com/discord-tickets/bot/blob/main/CONTRIBUTORS.md">
|
||||
<img src="https://img.shields.io/github/all-contributors/discord-tickets/bot?color=ee8449&style=flat-square"alt="All contributors">
|
||||
</a>
|
||||
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
||||
|
||||
## Contributors ✨
|
||||
|
||||
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
|
||||
@ -10,27 +13,40 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
||||
<!-- prettier-ignore-start -->
|
||||
<!-- markdownlint-disable -->
|
||||
<table>
|
||||
<tr>
|
||||
<td align="center"><a href="https://eartharoid.me/"><img src="https://avatars.githubusercontent.com/u/20905071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Isaac</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=eartharoid" title="Code">💻</a> <a href="#maintenance-eartharoid" title="Maintenance">🚧</a> <a href="https://github.com/discord-tickets/bot/commits?author=eartharoid" title="Documentation">📖</a> <a href="https://github.com/discord-tickets/bot/pulls?q=is%3Apr+reviewed-by%3Aeartharoid" title="Reviewed Pull Requests">👀</a> <a href="#design-eartharoid" title="Design">🎨</a></td>
|
||||
<td align="center"><a href="https://github.com/iDrunK65"><img src="https://avatars.githubusercontent.com/u/25486774?v=4?s=100" width="100px;" alt=""/><br /><sub><b>iDrunK65</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=iDrunK65" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/nicholasyoannou"><img src="https://avatars.githubusercontent.com/u/29736141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Y.</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=nicholasyoannou" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/RhysB"><img src="https://avatars.githubusercontent.com/u/25815220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rhys B</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=RhysB" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/mgsi100"><img src="https://avatars.githubusercontent.com/u/36934590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sébastien Guzman</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=mgsi100" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/iFusionFr"><img src="https://avatars.githubusercontent.com/u/31099360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>iFusion</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=iFusionFr" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://fivepixels.me/"><img src="https://avatars.githubusercontent.com/u/37427166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>FivePixels</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=FivePixels" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://davidjcralph.co.uk/"><img src="https://avatars.githubusercontent.com/u/14052956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David Ralph</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=davidjcralph" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/OliverCordingl1"><img src="https://avatars.githubusercontent.com/u/19516518?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Cordingley</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=OliverCordingl1" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/itzJOHv"><img src="https://avatars.githubusercontent.com/u/68508885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itzJOHv</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=itzJOHv" title="Code">💻</a> <a href="#question-itzJOHv" title="Answering Questions">💬</a></td>
|
||||
<td align="center"><a href="https://github.com/CanerBaba25"><img src="https://avatars.githubusercontent.com/u/33705518?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CanerBaba25</b></sub></a><br /><a href="#translation-CanerBaba25" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/Felimir"><img src="https://avatars.githubusercontent.com/u/52141188?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fel</b></sub></a><br /><a href="#translation-Felimir" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/donzee529"><img src="https://avatars.githubusercontent.com/u/43678009?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Doniel</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=donzee529" title="Documentation">📖</a> <a href="https://github.com/discord-tickets/bot/commits?author=donzee529" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://puneetgopinath.github.io/"><img src="https://avatars.githubusercontent.com/u/76863199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet Gopinath</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=PuneetGopinath" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/thevisuales"><img src="https://avatars.githubusercontent.com/u/6569806?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thevisuales</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=thevisuales" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://eartharoid.me/"><img src="https://avatars.githubusercontent.com/u/20905071?v=4?s=100" width="100px;" alt="Isaac"/><br /><sub><b>Isaac</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=eartharoid" title="Code">💻</a> <a href="#maintenance-eartharoid" title="Maintenance">🚧</a> <a href="https://github.com/discord-tickets/bot/commits?author=eartharoid" title="Documentation">📖</a> <a href="https://github.com/discord-tickets/bot/pulls?q=is%3Apr+reviewed-by%3Aeartharoid" title="Reviewed Pull Requests">👀</a> <a href="#design-eartharoid" title="Design">🎨</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/iDrunK65"><img src="https://avatars.githubusercontent.com/u/25486774?v=4?s=100" width="100px;" alt="iDrunK65"/><br /><sub><b>iDrunK65</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=iDrunK65" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nicholasyoannou"><img src="https://avatars.githubusercontent.com/u/29736141?v=4?s=100" width="100px;" alt="Nicholas Y."/><br /><sub><b>Nicholas Y.</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=nicholasyoannou" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/RhysB"><img src="https://avatars.githubusercontent.com/u/25815220?v=4?s=100" width="100px;" alt="Rhys B"/><br /><sub><b>Rhys B</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=RhysB" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mgsi100"><img src="https://avatars.githubusercontent.com/u/36934590?v=4?s=100" width="100px;" alt="Sébastien Guzman"/><br /><sub><b>Sébastien Guzman</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=mgsi100" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/iFusionFr"><img src="https://avatars.githubusercontent.com/u/31099360?v=4?s=100" width="100px;" alt="iFusion"/><br /><sub><b>iFusion</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=iFusionFr" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://fivepixels.me/"><img src="https://avatars.githubusercontent.com/u/37427166?v=4?s=100" width="100px;" alt="FivePixels"/><br /><sub><b>FivePixels</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=FivePixels" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://davidcralph.co.uk/"><img src="https://avatars.githubusercontent.com/u/14052956?v=4?s=100" width="100px;" alt="David Ralph"/><br /><sub><b>David Ralph</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=davidcralph" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/OliverCordingl1"><img src="https://avatars.githubusercontent.com/u/19516518?v=4?s=100" width="100px;" alt="Oliver Cordingley"/><br /><sub><b>Oliver Cordingley</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=OliverCordingl1" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/itzJOHv"><img src="https://avatars.githubusercontent.com/u/68508885?v=4?s=100" width="100px;" alt="itzJOHv"/><br /><sub><b>itzJOHv</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=itzJOHv" title="Code">💻</a> <a href="#question-itzJOHv" title="Answering Questions">💬</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/CanerBaba25"><img src="https://avatars.githubusercontent.com/u/33705518?v=4?s=100" width="100px;" alt="CanerBaba25"/><br /><sub><b>CanerBaba25</b></sub></a><br /><a href="#translation-CanerBaba25" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Felimir"><img src="https://avatars.githubusercontent.com/u/52141188?v=4?s=100" width="100px;" alt="Fel"/><br /><sub><b>Fel</b></sub></a><br /><a href="#translation-Felimir" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/donzee529"><img src="https://avatars.githubusercontent.com/u/43678009?v=4?s=100" width="100px;" alt="Doniel"/><br /><sub><b>Doniel</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=donzee529" title="Documentation">📖</a> <a href="https://github.com/discord-tickets/bot/commits?author=donzee529" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://puneetgopinath.github.io/"><img src="https://avatars.githubusercontent.com/u/76863199?v=4?s=100" width="100px;" alt="Puneet Gopinath"/><br /><sub><b>Puneet Gopinath</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=PuneetGopinath" title="Code">💻</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/thevisuales"><img src="https://avatars.githubusercontent.com/u/6569806?v=4?s=100" width="100px;" alt="thevisuales"/><br /><sub><b>thevisuales</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=thevisuales" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://rooray.xyz"><img src="https://avatars.githubusercontent.com/u/86845749?v=4?s=100" width="100px;" alt="RooRay"/><br /><sub><b>RooRay</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=RooRay" title="Documentation">📖</a> <a href="https://github.com/discord-tickets/bot/commits?author=RooRay" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://foxco-network.de"><img src="https://avatars.githubusercontent.com/u/54017453?v=4?s=100" width="100px;" alt="FoxXxHater"/><br /><sub><b>FoxXxHater</b></sub></a><br /><a href="#platform-FoxXxHater" title="Packaging/porting to new platform">📦</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://adminrat.codes"><img src="https://avatars.githubusercontent.com/u/24538037?v=4?s=100" width="100px;" alt="AdminRAT"/><br /><sub><b>AdminRAT</b></sub></a><br /><a href="#platform-AdminRAT" title="Packaging/porting to new platform">📦</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://c43721.dev"><img src="https://avatars.githubusercontent.com/u/55610086?v=4?s=100" width="100px;" alt="c43721"/><br /><sub><b>c43721</b></sub></a><br /><a href="#platform-c43721" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/discord-tickets/bot/commits?author=c43721" title="Documentation">📖</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/n1kkl"><img src="https://avatars.githubusercontent.com/u/100782498?v=4?s=100" width="100px;" alt="Niklas"/><br /><sub><b>Niklas</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=n1kkl" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Uzurka"><img src="https://avatars.githubusercontent.com/u/101745008?v=4?s=100" width="100px;" alt="Uzurka"/><br /><sub><b>Uzurka</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/issues?q=author%3AUzurka" title="Bug reports">🐛</a> <a href="#platform-Uzurka" title="Packaging/porting to new platform">📦</a> <a href="#translation-Uzurka" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/iNOEEL"><img src="https://avatars.githubusercontent.com/u/26775559?v=4?s=100" width="100px;" alt="Noel Horvath"/><br /><sub><b>Noel Horvath</b></sub></a><br /><a href="#translation-iNOEEL" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Gdanycz"><img src="https://avatars.githubusercontent.com/u/60316826?v=4?s=100" width="100px;" alt="Gdany"/><br /><sub><b>Gdany</b></sub></a><br /><a href="#translation-Gdanycz" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Chaosfelix4451"><img src="https://avatars.githubusercontent.com/u/46029764?v=4?s=100" width="100px;" alt="Chaosfelix4451"/><br /><sub><b>Chaosfelix4451</b></sub></a><br /><a href="#translation-Chaosfelix4451" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
|
||||
@ -1514,6 +1514,7 @@ packages:
|
||||
ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
- encoding
|
||||
- utf-8-validate
|
||||
dev: false
|
||||
|
||||
@ -1979,7 +1980,6 @@ packages:
|
||||
|
||||
/function-bind@1.1.1:
|
||||
resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
|
||||
dev: true
|
||||
|
||||
/get-caller-file@2.0.5:
|
||||
resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
|
||||
@ -2115,7 +2115,6 @@ packages:
|
||||
engines: {node: '>= 0.4.0'}
|
||||
dependencies:
|
||||
function-bind: 1.1.1
|
||||
dev: true
|
||||
|
||||
/hex-to-rgba@2.0.1:
|
||||
resolution: {integrity: sha512-5XqPJBpsEUMsseJUi2w2Hl7cHFFi3+OO10M2pzAvKB1zL6fc+koGMhmBqoDOCB4GemiRM/zvDMRIhVw6EkB8dQ==}
|
||||
@ -3011,7 +3010,6 @@ packages:
|
||||
/pify@3.0.0:
|
||||
resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
|
||||
engines: {node: '>=4'}
|
||||
dev: true
|
||||
|
||||
/pify@5.0.0:
|
||||
resolution: {integrity: sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user