Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/vidzy-social/vidzy
Browse files Browse the repository at this point in the history
  • Loading branch information
ProgramminCat committed Jan 3, 2025
2 parents 12654bd + a694fc0 commit b016f94
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
26 changes: 25 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
"profile": "https://github.com/ProgramminCat",
"contributions": [
"code",
"design"
"design",
"ideas",
"question",
"maintenance",
"review",
"security"
]
},
{
Expand All @@ -36,6 +41,25 @@
"contributions": [
"code"
]
},
{
"login": "chusopr",
"name": "Chuso Pérez",
"avatar_url": "https://avatars.githubusercontent.com/u/3270352?v=4",
"profile": "https://chuso.net",
"contributions": [
"security"
]
},
{
"login": "everypizza1",
"name": "Derry Tutt",
"avatar_url": "https://avatars.githubusercontent.com/u/82726593?v=4",
"profile": "https://everypizza.bearblog.dev",
"contributions": [
"code",
"bug"
]
}
]
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM --platform=$BUILDPLATFORM python:3-alpine AS builder
FROM --platform=$BUILDPLATFORM python:3.12-alpine AS builder

WORKDIR /app

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ Vidzy is open-source software licensed under the GNU Affero General Public Licen
<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ProgramminCat"><img src="https://avatars.githubusercontent.com/u/72707293?v=4?s=100" width="100px;" alt="ProgramminCat"/><br /><sub><b>ProgramminCat</b></sub></a><br /><a href="#code-ProgramminCat" title="Code">💻</a> <a href="#design-ProgramminCat" title="Design">🎨</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ProgramminCat"><img src="https://avatars.githubusercontent.com/u/72707293?v=4?s=100" width="100px;" alt="ProgramminCat"/><br /><sub><b>ProgramminCat</b></sub></a><br /><a href="#code-ProgramminCat" title="Code">💻</a> <a href="#design-ProgramminCat" title="Design">🎨</a> <a href="#ideas-ProgramminCat" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-ProgramminCat" title="Answering Questions">💬</a> <a href="#maintenance-ProgramminCat" title="Maintenance">🚧</a> <a href="#review-ProgramminCat" title="Reviewed Pull Requests">👀</a> <a href="#security-ProgramminCat" title="Security">🛡️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kodxana"><img src="https://avatars.githubusercontent.com/u/16674412?v=4?s=100" width="100px;" alt="Madiator2011"/><br /><sub><b>Madiator2011</b></sub></a><br /><a href="#design-kodxana" title="Design">🎨</a> <a href="#code-kodxana" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nycterent"><img src="https://avatars.githubusercontent.com/u/81133?v=4?s=100" width="100px;" alt="Marty"/><br /><sub><b>Marty</b></sub></a><br /><a href="#code-nycterent" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://chuso.net"><img src="https://avatars.githubusercontent.com/u/3270352?v=4?s=100" width="100px;" alt="Chuso Pérez"/><br /><sub><b>Chuso Pérez</b></sub></a><br /><a href="#security-chusopr" title="Security">🛡️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://everypizza.bearblog.dev"><img src="https://avatars.githubusercontent.com/u/82726593?v=4?s=100" width="100px;" alt="Derry Tutt"/><br /><sub><b>Derry Tutt</b></sub></a><br /><a href="#code-everypizza1" title="Code">💻</a> <a href="#bug-everypizza1" title="Bug reports">🐛</a></td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit b016f94

Please sign in to comment.