Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lynxie/config.py
This commit is contained in:
Michał Gdula 2023-09-11 23:25:10 +01:00
commit 42a41509c5
3 changed files with 7 additions and 7 deletions

View file

@ -12,12 +12,11 @@ DISCORD_TOKEN = (
or None
)
DISCORD_GUILD_ID = Object(id=1040757387033849976)
LYNXIE_PREFIX = "?"
DATA_PATH = os.path.join("lynxie", "data")
ASSETS_PATH = os.path.join("lynxie", "assets")
DATABASE_URI = f"sqlite:///" + os.path.join(DATA_PATH, "lynxie.db")