Skip to content

Commit

Permalink
Merge branch 'develop' into cypress-13
Browse files Browse the repository at this point in the history
  • Loading branch information
tidusjar authored Jan 3, 2025
2 parents e8ca519 + b00e387 commit fefc768
Show file tree
Hide file tree
Showing 25 changed files with 658 additions and 184 deletions.
27 changes: 10 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,10 @@ Here are some of the features Ombi has:
</a>
</td>
<td align="center">
<a href="https://github.com/sussycatgirl">
<img src="https://avatars.githubusercontent.com/u/26145882?v=4" width="50;" alt="sussycatgirl"/>
<a href="https://github.com/Drewster727">
<img src="https://avatars.githubusercontent.com/u/4528753?v=4" width="50;" alt="Drewster727"/>
<br />
<sub><b>Lea</b></sub>
<sub><b>Drew</b></sub>
</a>
</td>
<td align="center">
Expand Down Expand Up @@ -759,13 +759,6 @@ Here are some of the features Ombi has:
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/AlexandrePicavet">
<img src="https://avatars.githubusercontent.com/u/25816980?v=4" width="50;" alt="AlexandrePicavet"/>
<br />
<sub><b>Alexandre Picavet</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/XanderStrike">
<img src="https://avatars.githubusercontent.com/u/1565303?v=4" width="50;" alt="XanderStrike"/>
Expand All @@ -787,6 +780,13 @@ Here are some of the features Ombi has:
<sub><b>Abe Kline</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/sussycatgirl">
<img src="https://avatars.githubusercontent.com/u/26145882?v=4" width="50;" alt="sussycatgirl"/>
<br />
<sub><b>Lea</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/kmlucy">
<img src="https://avatars.githubusercontent.com/u/13952475?v=4" width="50;" alt="kmlucy"/>
Expand Down Expand Up @@ -901,13 +901,6 @@ Here are some of the features Ombi has:
<br />
<sub><b>Eli</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Drewster727">
<img src="https://avatars.githubusercontent.com/u/4528753?v=4" width="50;" alt="Drewster727"/>
<br />
<sub><b>Drew</b></sub>
</a>
</td></tr>
</table>
<!-- readme: collaborators,contributors -end -->
Expand Down
2 changes: 1 addition & 1 deletion src/.idea/.idea.Ombi/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 77 additions & 59 deletions src/.idea/.idea.Ombi/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fefc768

Please sign in to comment.