Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in changes from main branch #1

Merged
merged 13 commits into from
Sep 29, 2024
Merged

Pull in changes from main branch #1

merged 13 commits into from
Sep 29, 2024

Conversation

amycatgirl
Copy link
Member

No description provided.

@amycatgirl amycatgirl self-assigned this Sep 29, 2024
@amycatgirl amycatgirl merged commit cf4fec2 into feat/timeouts Sep 29, 2024
3 of 4 checks passed
amycatgirl added a commit that referenced this pull request Oct 19, 2024
* chore: remove Revolt assets submodule

this commit just uss the existing fallback assets - depending on what we intend to do re assets/once we hav them, we can clean up futher

* chore: lean up more Revolt references

* fix: delete folder...

* fix: ...then recreate it

* ci: specify permissions

* ci: see if skipping fetching helps

* chore: update locale strings

* chore: update lockfile

* feat: Add timeout option to context menu

Signed-off-by: Amy <amy@amogus.cloud>

* feat: add clear timeout option to user ctx menu

* feat: see for how much time a member has been timed out

* feat: localise strings

* chore: pull locale changes

---------

Signed-off-by: Amy <amy@amogus.cloud>
Co-authored-by: Rexogamer <beartechtalks@gmail.com>
Co-authored-by: Upryzing CI <upryzing-ci@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants