mirror of
https://github.com/Lissy93/dashy.git
synced 2024-12-23 00:41:37 +03:00
🔂 Resolve conflicts
This commit is contained in:
commit
2e38a33fa7
6
.github/AUTHORS.txt
vendored
6
.github/AUTHORS.txt
vendored
@ -142,10 +142,10 @@ dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - 6 commits
|
||||
kristian <kristianbrasel@gmail.com> - 6 commits
|
||||
liss-bot <liss-bot@users.noreply.github.com> - 6 commits
|
||||
Josua Blejeru <josua@blejeru.com> - 8 commits
|
||||
Liss-Bot <liss-bot@d0h.co> - 8 commits
|
||||
Tobias <tobias.meier109@gmail.com> - 8 commits
|
||||
Jimmeh <jimmeh@gmail.com> - 9 commits
|
||||
Kashif Sohail <kashif.ezone@gmail.com> - 9 commits
|
||||
Liss-Bot <liss-bot@d0h.co> - 10 commits
|
||||
Tobias <96661824+CrazyWolf13@users.noreply.github.com> - 12 commits
|
||||
Alejandro Pinar Ruiz <alejandropinarruiz@gmail.com> - 14 commits
|
||||
Alicia Sykes <=> - 16 commits
|
||||
@ -160,8 +160,8 @@ Alicia Sykes <alicia@futr.ai> - 28 commits
|
||||
Lissy93 <gh@d0h.co> - 78 commits
|
||||
repo-visualizer <repo-visualizer@users.noreply.github.com> - 128 commits
|
||||
Lissy93 <Lissy93@users.noreply.github.com> - 222 commits
|
||||
Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 237 commits
|
||||
liss-bot <liss-bot@d0h.co> - 240 commits
|
||||
Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 239 commits
|
||||
liss-bot <liss-bot@d0h.co> - 242 commits
|
||||
Alicia Sykes <gh@d0h.co> - 439 commits
|
||||
Alicia Sykes <alicia@omg.lol> - 471 commits
|
||||
Alicia Sykes <sykes.alicia@gmail.com> - 1488 commits
|
||||
|
11
README.md
11
README.md
@ -541,7 +541,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/Admonstrator">
|
||||
<img src="https://avatars.githubusercontent.com/u/69824?v=4" width="80;" alt="Admonstrator"/>
|
||||
<img src="https://avatars.githubusercontent.com/u/69824?u=1e226d7a36cdd661c3e4cd486fea140d045b7d57&v=4" width="80;" alt="Admonstrator"/>
|
||||
<br />
|
||||
<sub><b>Aaron Viehl</b></sub>
|
||||
</a>
|
||||
@ -555,7 +555,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/tbjers">
|
||||
<img src="https://avatars.githubusercontent.com/u/1117052?u=539d96d5e581b3139c75713ce35b89a36626404c&v=4" width="80;" alt="tbjers"/>
|
||||
<img src="https://avatars.githubusercontent.com/u/1117052?v=4" width="80;" alt="tbjers"/>
|
||||
<br />
|
||||
<sub><b>Torgny Bjers</b></sub>
|
||||
</a>
|
||||
@ -662,13 +662,6 @@ Huge thanks to the sponsors helping to support Dashy's development!
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/ratty222">
|
||||
<img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
|
||||
<br />
|
||||
<sub><b>Ratty222</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/NixyJuppie">
|
||||
<img src="https://avatars.githubusercontent.com/u/138570196?u=b102c222487905728b858704962d32759df29ebe&v=4" width="80;" alt="NixyJuppie"/>
|
||||
|
@ -13,7 +13,7 @@
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/Admonstrator">
|
||||
<img src="https://avatars.githubusercontent.com/u/69824?v=4" width="80;" alt="Admonstrator"/>
|
||||
<img src="https://avatars.githubusercontent.com/u/69824?u=1e226d7a36cdd661c3e4cd486fea140d045b7d57&v=4" width="80;" alt="Admonstrator"/>
|
||||
<br />
|
||||
<sub><b>Aaron Viehl</b></sub>
|
||||
</a>
|
||||
@ -27,7 +27,7 @@
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/tbjers">
|
||||
<img src="https://avatars.githubusercontent.com/u/1117052?u=539d96d5e581b3139c75713ce35b89a36626404c&v=4" width="80;" alt="tbjers"/>
|
||||
<img src="https://avatars.githubusercontent.com/u/1117052?v=4" width="80;" alt="tbjers"/>
|
||||
<br />
|
||||
<sub><b>Torgny Bjers</b></sub>
|
||||
</a>
|
||||
@ -133,13 +133,6 @@
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/ratty222">
|
||||
<img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
|
||||
<br />
|
||||
<sub><b>Ratty222</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/terminaltrove">
|
||||
<img src="https://avatars.githubusercontent.com/u/121595180?v=4" width="80;" alt="terminaltrove"/>
|
||||
|
Loading…
Reference in New Issue
Block a user