Andrew 97ddc1b964 Merge branch 'pretzel-patches' into 'dev' ...

# Conflicts:
#   app/classes/shared/server.py

2021-11-23 22:12:06 +00:00

..

static/assets

make the buttons stop disappearing

2021-11-22 16:51:53 -06:00

templates

Add EULA confirm message on server startup if EULA is not found.

2021-11-23 16:11:23 -05:00