Up-merged and resolved conflicts in routes/login.p and routes/votes.py

This commit is contained in:
Michael House 2022-05-22 08:23:59 -05:00
commit 82a18e5cad
32 changed files with 50 additions and 541 deletions

View file

@ -321,7 +321,7 @@ def sign_up_post(v):
session["history"] = []
else: admin_level=0
profileurl = '/assets/images/default-profile-pic.webp'
profileurl = '/e/feather.webp'
new_user = User(
username=username,