Merge branch 'dev' into 'dewfix'

# Conflicts:
#   app/classes/shared/models.py
This commit is contained in:
Andrew 2021-08-22 03:38:39 +00:00
commit 0d11b80181

View File

@ -118,7 +118,7 @@ class Servers(Model):
class Meta:
table_name = "servers"
database = database
class User_Servers(Model):
user_id = ForeignKeyField(Users, backref='user_server')