Merge branch 'main' into Develop

# Conflicts:
#	.gitea/workflows/build-main.yml
#	compose.yaml
This commit is contained in:
Aster Fialla
2026-03-11 21:42:57 -04:00
3 changed files with 5 additions and 4 deletions

View File

@@ -6,7 +6,9 @@ on:
pull_request:
branches: ["main"]
jobs:
workflow_dispatch:
jobs:
build:

View File

@@ -7,8 +7,6 @@ PluralFlux is a proxybot akin to PluralKit and Tupperbox, but for [Fluxer](https
[Sponsor the project](https://github.com/sponsors/pieartsy)
If it's not running at the moment, it's because my computer crashed or something. I'm looking to move running it to a somewhat more permanent solution.
## Commands
All commands are prefixed by `pf;`. Currently only a few are implemented.

View File

@@ -22,4 +22,5 @@ services:
volumes:
- pgadmindata:/var/lib/pgadmin
volumes:
pgdata:
pgdata:
pgadmindata: